rebase patches on top of v12.0.2

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

diff --git a/patches/0001-update-changelog.patch b/patches/0001-update-changelog.patch
index e4f6ee9b068f93b52978068d1b7a83f2ca001e10..599077519840f2dc1fe356ef31c6e986a8ed8643 100644 (file)
--- a/patches/0001-update-changelog.patch
+++ b/patches/0001-update-changelog.patch
@@ -1,7 +1,7 @@
-From ba9af8745b542dd4c76a8205f58ee8b828602865 Mon Sep 17 00:00:00 2001
+From f12b07be40d9cb909ef7b03c9168a274bfd13086 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/5] update changelog
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -12,10 +12,13 @@ Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
  1 file changed, 32 insertions(+)
 
 diff --git a/debian/changelog b/debian/changelog
-index e7ab154..0935ea6 100644
+index adf0b98..b366685 100644
 --- a/debian/changelog
 +++ b/debian/changelog
-@@ -1,9 +1,41 @@
+@@ -4,12 +4,44 @@ ceph (12.0.2-1) stable; urgency=medium
+ 
+  -- 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