diff options
author | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2009-02-08 15:37:38 -0800 |
---|---|---|
committer | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2009-02-08 15:37:38 -0800 |
commit | 2dacad150a55cf35514d5de4e89312603e1a4ce3 (patch) | |
tree | 6b3f277f43d27be009b3a4c82af414c0261ed800 | |
parent | 512db5872a0eed2346b7de8a381d55e52da81d44 (diff) | |
parent | c6d4234272d0d5c384678bf08be6324ed78f3268 (diff) | |
download | vyatta-cfg-2dacad150a55cf35514d5de4e89312603e1a4ce3.tar.gz vyatta-cfg-2dacad150a55cf35514d5de4e89312603e1a4ce3.zip |
Merge branch 'jenner' of suva.vyatta.com:/git/vyatta-cfg into jenner
-rw-r--r-- | debian/changelog | 6 | ||||
-rwxr-xr-x | lib/Vyatta/ConfigLoad.pm | 1 |
2 files changed, 7 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index e01c2d6..41a8ffb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +vyatta-cfg (0.14.11) unstable; urgency=low + + * Move config reload from quagga to vyatta-cfg + + -- Stephen Hemminger <stephen.hemminger@vyatta.com> Thu, 05 Feb 2009 14:47:22 -0800 + vyatta-cfg (0.14.10) unstable; urgency=low * Vyatta::Config - parseTmpl convert to 3 arg open diff --git a/lib/Vyatta/ConfigLoad.pm b/lib/Vyatta/ConfigLoad.pm index 54411ee..5903701 100755 --- a/lib/Vyatta/ConfigLoad.pm +++ b/lib/Vyatta/ConfigLoad.pm @@ -33,6 +33,7 @@ use Vyatta::Config; my $default_rank = 0; my %config_rank = ( 'qos-policy' => 1100, + 'firewall group' => 1021, 'firewall' => 1020, 'service nat' => 1010, 'system host-name' => 1005, |