From c52233daac5558e286d3d67c8186497c826a32bd Mon Sep 17 00:00:00 2001
From: Mark O'Brien <mobrien@vyatta.com>
Date: Tue, 29 Apr 2008 16:42:21 -0700
Subject: 3.0.3

---
 debian/changelog | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index e1076c5..93f5fa8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,20 @@
+vyatta-cfg (0.7) unstable; urgency=low
+
+  3.0.3
+  [ Mark O'Brien ]
+
+
+  [ Stephen Hemminger ]
+  * Remove hack to cycle state for static routes
+  * Eliminate vestigates of watchlink
+
+  [ rbalocca ]
+  * Indicate the VC4.0.2 release candidate in the changelog
+
+  [ Mark O'Brien ]
+
+ -- Mark O'Brien <mobrien@vyatta.com>  Tue, 29 Apr 2008 16:42:21 -0700
+
 vyatta-cfg (0.6) unstable; urgency=low
 
   VC4.0.2
-- 
cgit v1.2.3


From c47b5ebd10318a7d7d22fc401565a55da09a7e0f Mon Sep 17 00:00:00 2001
From: An-Cheng Huang <ancheng@vyatta.com>
Date: Thu, 1 May 2008 14:28:44 -0700
Subject: support "wildcard" ranking at boot time. only VRRP uses this for now.

cherry-picked from hollywood for VRRP issue.
---
 scripts/VyattaConfigLoad.pm | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/scripts/VyattaConfigLoad.pm b/scripts/VyattaConfigLoad.pm
index 2efa81e..b69723a 100755
--- a/scripts/VyattaConfigLoad.pm
+++ b/scripts/VyattaConfigLoad.pm
@@ -44,9 +44,33 @@ my %config_rank  = (
     'vpn'                   => 80,
 );
 
+my %wildcard_rank = (
+    'interfaces ethernet * vrrp' => 50,
+    'interfaces ethernet * vif * vrrp' => 50,
+);
+
 my @all_nodes = ();
 my @all_naked_nodes = ();
 
+# the wildcard matching could use some serious optimization. but probably
+# not when we only have a couple of entries.
+sub match_wildcard {
+  my ($pattern, $str) = @_;
+  $pattern =~ s/\*/\\S*/g;
+  $pattern =~ s/^(.*)$/\^$1\$/;
+  return ($str =~ m/$pattern/) ? 1 : 0;
+}
+
+sub get_wildcard_rank {
+  my ($str) = @_;
+  foreach (keys %wildcard_rank) {
+    if (match_wildcard($_, $str)) {
+      return $wildcard_rank{$_};
+    }
+  }
+  return undef;
+}
+
 sub get_config_rank {
   # longest prefix match
   my @path = @_;
@@ -55,6 +79,8 @@ sub get_config_rank {
     if (defined($config_rank{$path_str})) {
       return ($config_rank{$path_str});
     }
+    my $wrank = get_wildcard_rank($path_str);
+    return $wrank if (defined($wrank));
     pop @path;
   }
   return $default_rank;
-- 
cgit v1.2.3


From da3fd20dca05516c8661c5040c1ac9cdd17717ac Mon Sep 17 00:00:00 2001
From: Mark O'Brien <mobrien@vyatta.com>
Date: Mon, 5 May 2008 16:40:38 -0700
Subject: 3.0.4

---
 debian/changelog | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 93f5fa8..3a72592 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+vyatta-cfg (0.8) unstable; urgency=low
+
+  3.0.4
+  [ Mark O'Brien ]
+
+
+  [ An-Cheng Huang ]
+  * support "wildcard" ranking at boot time. only VRRP uses this for
+    now.
+
+  [ Mark O'Brien ]
+
+ -- Mark O'Brien <mobrien@vyatta.com>  Mon, 05 May 2008 16:40:38 -0700
+
 vyatta-cfg (0.7) unstable; urgency=low
 
   3.0.3
-- 
cgit v1.2.3


From 7423fede66914315ffcbd5cc63fa9ae92df75260 Mon Sep 17 00:00:00 2001
From: Mark O'Brien <mobrien@vyatta.com>
Date: Tue, 6 May 2008 12:43:19 -0700
Subject: 3.0.5

---
 debian/changelog | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 3a72592..734169c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+vyatta-cfg (0.9) unstable; urgency=low
+
+  3.0.5
+
+
+ -- Mark O'Brien <mobrien@vyatta.com>  Tue, 06 May 2008 12:43:19 -0700
+
 vyatta-cfg (0.8) unstable; urgency=low
 
   3.0.4
-- 
cgit v1.2.3