summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorStephen Hemminger <stephen.hemminger@vyatta.com>2009-06-01 16:06:33 -0700
committerStephen Hemminger <stephen.hemminger@vyatta.com>2009-06-01 16:06:33 -0700
commite9bec39ea6198e36745255a1853fe03f9a65a727 (patch)
treea2730e4e6ecf9a17a5cc654529714bc1e7b1320c /debian
parent15d9e99bae90169cce6da359cb45d5cda7076b71 (diff)
parent19a38fe4d18f05d69b97c6785d5ef752479db7bb (diff)
downloadvyatta-cfg-system-e9bec39ea6198e36745255a1853fe03f9a65a727.tar.gz
vyatta-cfg-system-e9bec39ea6198e36745255a1853fe03f9a65a727.zip
Merge branch 'jenner' into kenwood
Conflicts: debian/changelog
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog12
1 files changed, 0 insertions, 12 deletions
diff --git a/debian/changelog b/debian/changelog
index 20dc9ec9..cdb4d2bb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,15 +1,3 @@
-vyatta-cfg-system (0.15.49) unstable; urgency=low
-
- [ Stephen Hemminger ]
- * Print error message on failure to create group/user
-
- [ Mohit Mehta ]
- * move server,protocol to the same line in config file
-
- [ An-Cheng Huang ]
-
- -- An-Cheng Huang <ancheng@vyatta.com> Fri, 29 May 2009 18:35:29 -0700
-
vyatta-cfg-system (0.15.48) unstable; urgency=low
* Restore default facility for 'syslog console'