From e9638edf48bbb4f2dba5fa8795c2abd711975b8f Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <stephen.hemminger@vyatta.com>
Date: Fri, 25 Apr 2008 15:02:46 -0700
Subject: watchlink is no longer used

The watchlink exclude is no longer used.
---
 .../vif/node.tag/vrrp/vrrp-group/node.tag/virtual-address/node.def   | 5 -----
 .../node.tag/vrrp/vrrp-group/node.tag/virtual-address/node.def       | 5 -----
 2 files changed, 10 deletions(-)

diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/virtual-address/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/virtual-address/node.def
index c40c5f47..7d61f98e 100644
--- a/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/virtual-address/node.def
+++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/virtual-address/node.def
@@ -1,10 +1,5 @@
 multi:
 type: ipv4
 help: Configure virtual address
-
-create: sudo /opt/vyatta/sbin/vyatta-watchlink-exclude.pl --id=vrrp --action=add --intf="$VAR(../../../../@).$VAR(../../../@)" --ipadd=$VAR(@) --signal
-
-delete: sudo /opt/vyatta/sbin/vyatta-watchlink-exclude.pl --id=vrrp --action=remove --intf="$VAR(../../../../@).$VAR(../../../@)" --ipadd=$VAR(@) --signal
-
 comp_help: possible completions:
  <x.x.x.x>          Virtual IP address (up to 20 per group)
diff --git a/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/virtual-address/node.def b/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/virtual-address/node.def
index af8b4624..7d61f98e 100644
--- a/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/virtual-address/node.def
+++ b/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/virtual-address/node.def
@@ -1,10 +1,5 @@
 multi:
 type: ipv4
 help: Configure virtual address
-
-create: sudo /opt/vyatta/sbin/vyatta-watchlink-exclude.pl --id=vrrp --action=add --intf=$VAR(../../../@) --ipadd=$VAR(@) --signal
-
-delete: sudo /opt/vyatta/sbin/vyatta-watchlink-exclude.pl --id=vrrp --action=remove --intf=$VAR(../../../@) --ipadd=$VAR(@) --signal
-
 comp_help: possible completions:
  <x.x.x.x>          Virtual IP address (up to 20 per group)
-- 
cgit v1.2.3


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

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

diff --git a/debian/changelog b/debian/changelog
index 263a6f69..1e41734f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+vyatta-cfg-system (0.7) unstable; urgency=low
+
+  3.0.3
+  [ Mark O'Brien ]
+
+
+  [ Stephen Hemminger ]
+  * watchlink is no longer used
+
+  [ 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:17 -0700
+
 vyatta-cfg-system (0.6) unstable; urgency=low
 
   VC4.0.2
-- 
cgit v1.2.3


From 4dada2ec3af679c4f2492d297738d7e1e0d0fe4f Mon Sep 17 00:00:00 2001
From: rbalocca <rbalocca@vyatta.com>
Date: Tue, 22 Apr 2008 18:49:18 -0700
Subject: config.boot.default is not moved to the top level repo
 (build-iso.git)

---
 Makefile.am                 |  1 -
 sysconf/config.boot.default | 30 ------------------------------
 2 files changed, 31 deletions(-)
 delete mode 100644 sysconf/config.boot.default

diff --git a/Makefile.am b/Makefile.am
index 949aba4a..9e35f778 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -38,7 +38,6 @@ sysconf_DATA += sysconf/logrotate_messages
 sysconf_DATA += sysconf/motd.tail
 sysconf_DATA += sysconf/syslog.conf
 sysconf_DATA += sysconf/default_ssh
-sysconf_DATA += sysconf/config.boot.default
 
 libudev_SCRIPTS	 = scripts/vyatta_net_name
 etcudev_DATA	 = sysconf/vyatta-net.rules
diff --git a/sysconf/config.boot.default b/sysconf/config.boot.default
deleted file mode 100644
index fdde1c74..00000000
--- a/sysconf/config.boot.default
+++ /dev/null
@@ -1,30 +0,0 @@
-system {
-    ntp-server "69.59.150.135"
-    login {
-        user root {
-            authentication {
-                encrypted-password: "$1$$Ht7gBYnxI1xCdO/JOnodh."
-            }
-        }
-        user vyatta {
-            authentication {
-                encrypted-password: "$1$$Ht7gBYnxI1xCdO/JOnodh."
-            }
-        }
-    }
-    package {
-        repository community {
-	    distribution: "stable"
-            components: "main"
-            url: "http://packages.vyatta.com/vyatta"
-        }
-    }
-}
-
-interfaces {
-    loopback lo {
-    }
-}
-
-/* Warning: Do not remove the following line. */
-/* === vyatta-config-version: "cluster@1:dhcp-relay@1:dhcp-server@1:firewall@1:nat@2:serial@1:webgui@1" === */
-- 
cgit v1.2.3