summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorDaniil Baturin <daniil@baturin.org>2018-10-28 20:10:25 +0100
committerDaniil Baturin <daniil@baturin.org>2018-10-28 20:10:25 +0100
commit0ea64f7c139685066663117aa30c52fb9aeb5680 (patch)
treec43f97eb78b317a4aae31c6764099aa524b664f8 /debian
parentadf0dac4bc7a42303d49e2ed03ac9d0d888a157e (diff)
parent92c15a6c1268eb28738899d85568d051124f8f51 (diff)
downloadvyatta-op-0ea64f7c139685066663117aa30c52fb9aeb5680.tar.gz
vyatta-op-0ea64f7c139685066663117aa30c52fb9aeb5680.zip
Merge branch 'current' into crux
Conflicts: debian/changelog
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog8
1 files changed, 5 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog
index 9c62b0c..1e1d6ca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
-vyatta-op (1.2.0-1) stable; urgency=medium
+vyatta-op (0.14.0+vyos2+current7) unstable; urgency=medium
- * New branch.
+ * T870: Commit-confirm restarts the server even after commit
+
+ - show reboot now also show if scheduled via commit-confirm or systemd.
- -- Daniil Baturin <daniil@baturin.org> Fri, 28 Sep 2018 22:03:28 +0200
+ -- hagbard <vyosdev@derith.de> Tue, 09 Oct 2018 16:07:22 -0700
vyatta-op (0.14.0+vyos2+current6) unstable; urgency=medium