bump version to 12.0.2-pve1

[ceph.git] / patches / 0001-update-changelog.patch

diff --git a/patches/0001-update-changelog.patch b/patches/0001-update-changelog.patch
index 64a30bd38198d16fe6a0443342c2258ba451231d..42fa3ac98313ac21a9a23747baa2ff410866b6a4 100644 (file)
--- a/patches/0001-update-changelog.patch
+++ b/patches/0001-update-changelog.patch
@@ -1,21 +1,67 @@
-From eaa617f8559ac5b373e74231471ce56c41f2ccd3 Mon Sep 17 00:00:00 2001
+From a3a706cfe86d02c1c6f7564d2ddd9c155bd9ff80 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com>
 Date: Mon, 20 Mar 2017 09:12:50 +0100
-Subject: [PATCH 1/2] update changelog
+Subject: [PATCH 1/6] update changelog
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
 
 Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
 ---
- debian/changelog | 6 ++++++
- 1 file changed, 6 insertions(+)
+ debian/changelog | 40 ++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 40 insertions(+)
 
 diff --git a/debian/changelog b/debian/changelog
-index a726c2d..a2e42d8 100644
+index adf0b98..5956db2 100644
 --- a/debian/changelog
 +++ b/debian/changelog
-@@ -1,3 +1,9 @@
+@@ -1,15 +1,55 @@
++ceph (12.0.2-pve1) stable; urgency=medium
++
++  * rebase on top of v12.0.2
++
++  * cherry-pick monitor upgrade fix for upgrades from <= v12.0.2
++
++ -- Proxmox Support Team <support@proxmox.com>  Wed, 26 Apr 2017 10:20:20 +0200
++
+ ceph (12.0.2-1) stable; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Ceph Release Team <ceph-maintainers@ceph.com>  Thu, 20 Apr 2017 19:59:57 +0000
+ 
++ceph (12.0.1-pve1) stable; urgency=medium
++
++  * revert dropping of boost build dependencies
++
++  * revert including our package release in ceph version output
++
++ -- Proxmox Support Team <support@proxmox.com>  Wed, 29 Mar 2017 09:43:26 +0200
++
+ ceph (12.0.1-1) stable; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Ceph Release Team <ceph-maintainers@ceph.com>  Fri, 24 Mar 2017 15:47:57 +0000
+ 
++ceph (12.0.0-pve3) stable; urgency=medium
++
++  * make ceph version output even more explicit
++
++  * enable systemd targets by default
++
++  * fix IPv6 monitor creation bug
++
++ -- Proxmox Support Team <support@proxmox.com>  Wed, 22 Mar 2017 09:02:37 +0100
++
++ceph (12.0.0-pve2) stable; urgency=medium
++
++  * support Debian Stretch in ceph-detect-init
++
++  * fix "ceph version" output
++
++ -- Proxmox Support Team <support@proxmox.com>  Tue, 21 Mar 2017 09:58:27 +0100
++
 +ceph (12.0.0-pve1) stable; urgency=medium
 +
 +  * Rebuild for PVE 5.0 / Debian Stretch