From 889f218328589847ec699292863e5b3ed2c936d5 Mon Sep 17 00:00:00 2001
From: John Southworth <john.southworth@vyatta.com>
Date: Tue, 6 Dec 2011 11:43:48 -0800
Subject: Add parsing of vrrp interfaces so that 'show vrrp interfaces
 <vmac-interface>' will do what the user intended.

    Users should still be prompted to use the underlying interface name,
    but if they enter the vmac interface instead we should 'do what they mean'
---
 scripts/keepalived/vyatta-show-vrrp.pl | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/scripts/keepalived/vyatta-show-vrrp.pl b/scripts/keepalived/vyatta-show-vrrp.pl
index 818d5e40..ecf2bf75 100755
--- a/scripts/keepalived/vyatta-show-vrrp.pl
+++ b/scripts/keepalived/vyatta-show-vrrp.pl
@@ -301,6 +301,16 @@ if ($showsummary == 1) {
 }
 
 foreach my $intf (@intfs) {
+    my $intf_vrid;
+    if ($intf =~ m/(\w+)\.(\d+)v(\d+)/){
+       $intf = "$1.$2";
+       $intf_vrid = $3; 
+    } elsif ($intf =~ m/(\w+)v(\d+)/){
+       $intf = $1;
+       $intf_vrid = $2; 
+    }
+    next if ($group ne 'all' && $intf_vrid && $intf_vrid != $group);
+    $group = $intf_vrid if ($group eq 'all' && $intf_vrid);
     my @state_files = Vyatta::Keepalived::get_state_files($intf, $group);
     foreach my $state_file (@state_files) {
 	&$display_func($state_file);
-- 
cgit v1.2.3


From 50bf825368638cb640f79f7c4d875cf87274a058 Mon Sep 17 00:00:00 2001
From: John Southworth <john.southworth@vyatta.com>
Date: Tue, 6 Dec 2011 11:50:17 -0800
Subject: 0.19.139

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

diff --git a/debian/changelog b/debian/changelog
index 1fa67159..1c8902bd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+vyatta-cfg-system (0.19.139) unstable; urgency=low
+
+  * Add parsing of vrrp interfaces so that 'show vrrp interfaces <vmac-
+    interface>' will do what the user intended.
+
+ -- John Southworth <john.southworth@vyatta.com>  Tue, 06 Dec 2011 11:50:17 -0800
+
 vyatta-cfg-system (0.19.138) unstable; urgency=low
 
   * make vyatta-interfaces.pl aware of vrrp interfaces
-- 
cgit v1.2.3


From 2a1863ccc87927b51042b8c23a7b2c819a18707c Mon Sep 17 00:00:00 2001
From: Bob Gilligan <gilligan@vyatta.com>
Date: Tue, 6 Dec 2011 14:05:30 -0800
Subject: Fix up formating of Vyatta specific HTTP options.

---
 scripts/install/install-image | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/install/install-image b/scripts/install/install-image
index ea8cfd7f..b5061b26 100755
--- a/scripts/install/install-image
+++ b/scripts/install/install-image
@@ -62,9 +62,9 @@ fetch_iso_by_url ()
 	auth=""
     fi
 
-    client_hdr="-H vyatta-client: install-image"
+    client_hdr="-HVyatta-Client: install-image"
     vyatta_version=`dpkg-query --showformat='${Version}' --show vyatta-version`
-    vers_hdr="-H vyatta-version: $vyatta_version"
+    vers_hdr="-HVyatta-Version: $vyatta_version"
 
     filename="${TEMP_DIR}/${NEW_ISO##*/}"
     curl "$client_hdr" "$vers_hdr" $auth -f -o $filename $NEW_ISO
-- 
cgit v1.2.3


From 98ea07e76bb82a3fe60b7f8d2e6d23ea0b2da539 Mon Sep 17 00:00:00 2001
From: Bob Gilligan <gilligan@vyatta.com>
Date: Tue, 6 Dec 2011 14:05:59 -0800
Subject: 0.19.140

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

diff --git a/debian/changelog b/debian/changelog
index 1c8902bd..95ab609e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+vyatta-cfg-system (0.19.140) unstable; urgency=low
+
+  * Fix up formating of Vyatta specific HTTP options.
+
+ -- Bob Gilligan <gilligan@vyatta.com>  Tue, 06 Dec 2011 14:05:59 -0800
+
 vyatta-cfg-system (0.19.139) unstable; urgency=low
 
   * Add parsing of vrrp interfaces so that 'show vrrp interfaces <vmac-
-- 
cgit v1.2.3