bump version to 12.1.1-pve1 while rebasing patches

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

diff --git a/patches/0001-update-changelog.patch b/patches/0001-update-changelog.patch
index e4f6ee9b068f93b52978068d1b7a83f2ca001e10..02e471a9b478f40c785662b500d512e28b43d382 100644 (file)
--- a/patches/0001-update-changelog.patch
+++ b/patches/0001-update-changelog.patch
@@ -1,21 +1,97 @@
-From ba9af8745b542dd4c76a8205f58ee8b828602865 Mon Sep 17 00:00:00 2001
+From 22c6c7657b2767dcd9cbe3b0c42b363f3c979a3c 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/6] update changelog
+Subject: [PATCH 1/3] 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 | 32 ++++++++++++++++++++++++++++++++
- 1 file changed, 32 insertions(+)
+ debian/changelog | 84 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 84 insertions(+)
 
 diff --git a/debian/changelog b/debian/changelog
-index e7ab154..0935ea6 100644
+index 0da87edd48..9a029b1afe 100644
 --- a/debian/changelog
 +++ b/debian/changelog
-@@ -1,9 +1,41 @@
+@@ -1,33 +1,117 @@
++ceph (12.1.1-pve1) unstable; urgency=medium
++
++  * rebase on latest upstream Release Candidate
++
++ -- Proxmox Support Team <support@proxmox.com>  Wed, 19 Jul 2017 11:22:27 +0200
++
+ ceph (12.1.1-1) stable; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Ceph Release Team <ceph-maintainers@ceph.com>  Mon, 17 Jul 2017 16:55:59 +0000
+ 
++ceph (12.1.0-pve2) unstable; urgency=medium
++
++  * fix https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=582819
++
++  * add 0004-debian-workaround-the-bug-in-dpkg-maintscript-helper.patch
++
++ -- Proxmox Support Team <support@proxmox.com>  Mon, 03 Jul 2017 14:03:31 +0200
++
++ceph (12.1.0-pve1) stable; urgency=medium
++
++  * rebase on latest upstream Release Candidate
++
++  * enable new restful mgr module by default
++
++ -- Proxmox Support Team <support@proxmox.com>  Tue, 27 Jun 2017 09:44:46 +0200
++
+ ceph (12.1.0-1) stable; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Ceph Release Team <ceph-maintainers@ceph.com>  Thu, 22 Jun 2017 15:43:47 +0000
+ 
++ceph (12.0.3-pve3) stable; urgency=medium
++
++  * update logrotate fix to final version
++
++ -- Proxmox Support Team <support@proxmox.com>  Tue, 20 Jun 2017 09:27:53 +0200
++
++ceph (12.0.3-pve2) stable; urgency=medium
++
++  * fix Ceph #19938: two logrotate scripts when upgrading from Debian packages
++
++ -- Proxmox Support Team <support@proxmox.com>  Wed, 7 Jun 2017 10:20:06 +0200
++
++ceph (12.0.3-pve1) stable; urgency=medium
++
++  * rebase on top of v12.0.3
++
++  * don't enable (broken) ceph-mgr module by default
++
++  * use bundled boost
++
++ -- Proxmox Support Team <support@proxmox.com>  Tue, 6 Jun 2017 12:22:39 +0200
++
+ ceph (12.0.3-1) stable; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Ceph Release Team <ceph-maintainers@ceph.com>  Tue, 16 May 2017 12:42:53 +0000
+ 
++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
@@ -58,5 +134,5 @@ index e7ab154..0935ea6 100644
  
    * New upstream release
 -- 
-2.1.4
+2.11.0