summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Hemminger <stephen.hemminger@vyatta.com>2009-06-12 18:41:41 -0700
committerStephen Hemminger <stephen.hemminger@vyatta.com>2009-06-12 18:41:41 -0700
commit6f3d0a316584d62470b841078f0484bd58d66f4a (patch)
tree7b8d228c5c8c23d51c30fa71e8c8850e0a127c6f
parent4fb63789bf16c0453ad202f73fc78c8e05c55b69 (diff)
parent674f48051f14975827638e503affc43e5817f5fd (diff)
downloadvyatta-cfg-quagga-6f3d0a316584d62470b841078f0484bd58d66f4a.tar.gz
vyatta-cfg-quagga-6f3d0a316584d62470b841078f0484bd58d66f4a.zip
Merge branch 'jenner' of suva.vyatta.com:/git/vyatta-cfg-quagga into jenner
-rw-r--r--debian/changelog12
-rw-r--r--templates/protocols/ospfv3/area/node.tag/.filter-list/node.def (renamed from templates/protocols/ospfv3/area/node.tag/filter-list/node.def)0
-rw-r--r--templates/protocols/ospfv3/area/node.tag/.filter-list/node.tag/node.def (renamed from templates/protocols/ospfv3/area/node.tag/filter-list/node.tag/node.def)0
3 files changed, 12 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index c36d89db..15e9a24c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+vyatta-cfg-quagga (0.18.23+jenner8) unstable; urgency=low
+
+ * Hide filter-list node until bug 4498 is fixed.
+
+ -- Stig Thormodsrud <stig@vyatta.com> Wed, 10 Jun 2009 15:07:12 -0700
+
+vyatta-cfg-quagga (0.18.23+jenner7) unstable; urgency=low
+
+ * Remove hidden templates
+
+ -- Stephen Hemminger <stephen.hemminger@vyatta.com> Tue, 09 Jun 2009 15:58:20 -0700
+
vyatta-cfg-quagga (0.18.23+jenner6) unstable; urgency=low
* Fix OSPFv3 filter list node
diff --git a/templates/protocols/ospfv3/area/node.tag/filter-list/node.def b/templates/protocols/ospfv3/area/node.tag/.filter-list/node.def
index 791b3f5a..791b3f5a 100644
--- a/templates/protocols/ospfv3/area/node.tag/filter-list/node.def
+++ b/templates/protocols/ospfv3/area/node.tag/.filter-list/node.def
diff --git a/templates/protocols/ospfv3/area/node.tag/filter-list/node.tag/node.def b/templates/protocols/ospfv3/area/node.tag/.filter-list/node.tag/node.def
index eb63a9c2..eb63a9c2 100644
--- a/templates/protocols/ospfv3/area/node.tag/filter-list/node.tag/node.def
+++ b/templates/protocols/ospfv3/area/node.tag/.filter-list/node.tag/node.def