rebase patches

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

diff --git a/patches/0001-update-changelog.patch b/patches/0001-update-changelog.patch
index e16a28ed25177967080745503a114a7c14f39839..0188e63eec8d6933e62e25d3baf10d94080440aa 100644 (file)
--- a/patches/0001-update-changelog.patch
+++ b/patches/0001-update-changelog.patch
@@ -1,4 +1,4 @@
-From b7200cced039b30ee0500d1738728e5e4670c68f Mon Sep 17 00:00:00 2001
+From eb178d4a676f546deab7561d584797df0bdc9cf6 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
@@ -8,14 +8,30 @@ Content-Transfer-Encoding: 8bit
 
 Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
 ---
- debian/changelog | 128 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 128 insertions(+)
+ debian/changelog | 138 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 138 insertions(+)
 
 diff --git a/debian/changelog b/debian/changelog
-index f052439176..9fcd8f4ac5 100644
+index 7597cb680b..9ea4f278fb 100644
 --- a/debian/changelog
 +++ b/debian/changelog
-@@ -1,63 +1,191 @@
+@@ -1,69 +1,207 @@
++ceph (12.2.2-pve1) stable; urgency=medium
++
++  * rebase on latest upstream release
++
++  * add LZ4 support
++
++  * remove ceph-disk deprecation warning
++
++ -- Proxmox Support Team <support@proxmox.com>  Mon, 4 Dec 2017 10:22:17 +0100
++
+ ceph (12.2.2-1) stable; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Ceph Release Team <ceph-maintainers@ceph.com>  Thu, 30 Nov 2017 14:59:26 +0000
+ 
 +ceph (12.2.1-pve3) stable; urgency=medium
 +
 +  * cherry-pick monitor obsolete command fix
@@ -208,5 +224,5 @@ index f052439176..9fcd8f4ac5 100644
  
    * New upstream release
 -- 
-2.14.1
+2.14.2