summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Southworth <john.southworth@vyatta.com>2011-01-20 19:41:18 -0600
committerJohn Southworth <john.southworth@vyatta.com>2011-01-20 19:41:18 -0600
commit53f9b4f72acbae5b55873dcc9cf3647173ff32f5 (patch)
treed842ede180789958dd90498f880d4268f3bfc545
parent974895246d4163c04d701648f544cb63f64c2d8e (diff)
downloadvyatta-cfg-vpn-53f9b4f72acbae5b55873dcc9cf3647173ff32f5.tar.gz
vyatta-cfg-vpn-53f9b4f72acbae5b55873dcc9cf3647173ff32f5.zip
-rw-r--r--debian/changelog8
1 files changed, 8 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 3ab3125..6a5dd85 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+vyatta-cfg-vpn (0.12.47) unstable; urgency=low
+
+ * fix conflict while merging
+ * make adjustment so that op mode can deal with new secrets file
+ format
+
+ -- John Southworth <john.southworth@vyatta.com> Thu, 20 Jan 2011 19:41:18 -0600
+
vyatta-cfg-vpn (0.12.46) unstable; urgency=low
* error location support changes to vpn (local-ip and auth missing