rebase patches

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

diff --git a/patches/0001-update-changelog.patch b/patches/0001-update-changelog.patch
index 6247509f394532962dedf50db8dcef4e1025a21b..0188e63eec8d6933e62e25d3baf10d94080440aa 100644 (file)
--- a/patches/0001-update-changelog.patch
+++ b/patches/0001-update-changelog.patch
@@ -1,21 +1,99 @@
-From 24a448f97ae389d300159b43d4becf8f841e867f 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/3] 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 | 90 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 90 insertions(+)
+ debian/changelog | 138 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 138 insertions(+)
 
 diff --git a/debian/changelog b/debian/changelog
-index 25b6f5830b..35c5b08555 100644
+index 7597cb680b..9ea4f278fb 100644
 --- a/debian/changelog
 +++ b/debian/changelog
-@@ -1,39 +1,129 @@
+@@ -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
++
++  * cherry-pick ceph-disk OSD activation fix
++
++ -- Proxmox Support Team <support@proxmox.com>  Tue, 10 Oct 2017 10:31:44 +0200
++
++ceph (12.2.1-pve2) stable; urgency=medium
++
++  * cherry-pick RDMA fix
++
++ -- Proxmox Support Team <support@proxmox.com>  Fri, 6 Oct 2017 08:40:57 +0200
++
++ceph (12.2.1-pve1) stable; urgency=medium
++
++  * rebase on latest upstream release
++
++ -- Proxmox Support Team <support@proxmox.com>  Fri, 29 Sep 2017 09:58:17 +0200
++
+ ceph (12.2.1-1) stable; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Ceph Release Team <ceph-maintainers@ceph.com>  Tue, 26 Sep 2017 16:27:06 +0000
+ 
++ceph (12.2.0-pve1) stable; urgency=medium
++
++  * rebase on latest upstream release
++
++ -- Proxmox Support Team <support@proxmox.com>  Wed, 30 Aug 2017 08:26:23 +0200
++
+ ceph (12.2.0-1) stable; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Ceph Release Team <ceph-maintainers@ceph.com>  Mon, 28 Aug 2017 16:30:16 +0000
+ 
++ceph (12.1.4-pve1) unstable; urgency=medium
++
++  * rebase on latest upstream Release Candidate
++
++ -- Proxmox Support Team <support@proxmox.com>  Wed, 16 Aug 2017 08:02:47 +0200
++
+ ceph (12.1.4-1) stable; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Ceph Release Team <ceph-maintainers@ceph.com>  Tue, 15 Aug 2017 13:45:08 +0000
+ 
++ceph (12.1.3-pve1) unstable; urgency=medium
++
++  * rebase on latest upstream Release Candidate
++
++ -- Proxmox Support Team <support@proxmox.com>  Mon, 14 Aug 2017 08:44:52 +0200
++
+ ceph (12.1.3-1) stable; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Ceph Release Team <ceph-maintainers@ceph.com>  Thu, 10 Aug 2017 19:22:38 +0000
+ 
 +ceph (12.1.2-pve1) unstable; urgency=medium
 +
 +  * rebase on latest upstream Release Candidate
@@ -146,5 +224,5 @@ index 25b6f5830b..35c5b08555 100644
  
    * New upstream release
 -- 
-2.11.0
+2.14.2