bump version to 12.2.1-pve3

diff --git a/Makefile b/Makefile
index e7054734bef68fcde322d78ae31f5c4fe6e36dee..f4ae04f9583d93db04dc98f35ef51dd25905c992 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@ RELEASE=5.0
 
 PACKAGE=ceph
 VER=12.2.1
-DEBREL=pve2
+DEBREL=pve3
 
 SRCDIR=ceph
 BUILDSRC=${SRCDIR}-${VER}

diff --git a/patches/0001-update-changelog.patch b/patches/0001-update-changelog.patch
index f1e99c7fa14ac8db36fc37135483785fe31ac250..e16a28ed25177967080745503a114a7c14f39839 100644 (file)
--- a/patches/0001-update-changelog.patch
+++ b/patches/0001-update-changelog.patch
@@ -1,21 +1,29 @@
-From 76768681ea7bf8584d09751c8af648332dd41895 Mon Sep 17 00:00:00 2001
+From b7200cced039b30ee0500d1738728e5e4670c68f 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/4] 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 | 120 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 120 insertions(+)
+ debian/changelog | 128 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 128 insertions(+)
 
 diff --git a/debian/changelog b/debian/changelog
-index f052439176..a96ff7923b 100644
+index f052439176..9fcd8f4ac5 100644
 --- a/debian/changelog
 +++ b/debian/changelog
-@@ -1,63 +1,183 @@
+@@ -1,63 +1,191 @@
++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

diff --git a/patches/0002-cmake-disable-version-from-git.patch b/patches/0002-cmake-disable-version-from-git.patch
index 5f634bf7c6a5eeebd4617e5e312bb2f45b312b73..dc18bf7e481b6a7144c1422e7290f2dc3f3c35ef 100644 (file)
--- a/patches/0002-cmake-disable-version-from-git.patch
+++ b/patches/0002-cmake-disable-version-from-git.patch
@@ -1,7 +1,7 @@
-From 4df31954840f36329b88478c42408c038e9c706c Mon Sep 17 00:00:00 2001
+From 9328d6712ec3b7af8a2259a7b3a6a9d409967888 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com>
 Date: Wed, 31 May 2017 14:33:09 +0200
-Subject: [PATCH 2/4] cmake: disable version from git
+Subject: [PATCH 2/6] cmake: disable version from git
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit

diff --git a/patches/0003-enable-systemd-targets-by-default.patch b/patches/0003-enable-systemd-targets-by-default.patch
index 6eb510df7932ff56bb02308a7e92078b306fddfe..02622bee35b3c8d7a0a648f0360edbc7debb9297 100644 (file)
--- a/patches/0003-enable-systemd-targets-by-default.patch
+++ b/patches/0003-enable-systemd-targets-by-default.patch
@@ -1,7 +1,7 @@
-From 71a7eac99b460cfd32584a4e20cfc357e30dbf48 Mon Sep 17 00:00:00 2001
+From 7a378be467904722a8ca841702bfa308b27f07a8 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com>
 Date: Wed, 22 Mar 2017 09:00:34 +0100
-Subject: [PATCH 3/4] enable systemd targets by default
+Subject: [PATCH 3/6] enable systemd targets by default
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit

diff --git a/patches/0004-msg-async-rdma-uninitialized-variable-fix.patch b/patches/0004-msg-async-rdma-uninitialized-variable-fix.patch
index 6c338f488cb9d899b434714b2024a4bdfea0edf1..913cd3f99cd2d8a3d6002d0b9cccd558264c0256 100644 (file)
--- a/patches/0004-msg-async-rdma-uninitialized-variable-fix.patch
+++ b/patches/0004-msg-async-rdma-uninitialized-variable-fix.patch
@@ -1,7 +1,7 @@
-From 97974f5d003e41ee818392ea6a7bdd27be266bdd Mon Sep 17 00:00:00 2001
+From 4f6ca990a8ea08893ed6f8a8a679246b2bd5132e Mon Sep 17 00:00:00 2001
 From: Vasily Philipov <vasilyf@mellanox.com>
 Date: Tue, 3 Oct 2017 12:15:13 +0300
-Subject: [PATCH 4/4] msg/async/rdma: uninitialized variable fix
+Subject: [PATCH 4/6] msg/async/rdma: uninitialized variable fix
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit

diff --git a/patches/0005-ceph-disk-fix-runtime-omission-for-ceph-osd-service.patch b/patches/0005-ceph-disk-fix-runtime-omission-for-ceph-osd-service.patch
index 7720a8daecaf6a2e999dd8296e2c23e00e03b50e..bc3b2bdd314231f67285c4d3caedc142fa0725df 100644 (file)
--- a/patches/0005-ceph-disk-fix-runtime-omission-for-ceph-osd-service.patch
+++ b/patches/0005-ceph-disk-fix-runtime-omission-for-ceph-osd-service.patch
@@ -1,7 +1,7 @@
-From 67f56c5d882c8e4bed3d404825da3454732ca32a Mon Sep 17 00:00:00 2001
+From 1f438fee7b3b7ffb589ae7af942fca836521117d Mon Sep 17 00:00:00 2001
 From: Carl Xiong <xiongc05@gmail.com>
 Date: Fri, 22 Sep 2017 11:55:33 +0800
-Subject: [PATCH 5/5] ceph-disk: fix '--runtime' omission for ceph-osd service
+Subject: [PATCH 5/6] ceph-disk: fix '--runtime' omission for ceph-osd service
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit

diff --git a/patches/0006-mon-MgrMonitor-read-cmd-descs-if-empty-on-update_fro.patch b/patches/0006-mon-MgrMonitor-read-cmd-descs-if-empty-on-update_fro.patch
index 6c26977488178e74ac94de363596612a5e0fb7ae..e1206a1b629b54065a1650760afa68547db7e8c2 100644 (file)
--- a/patches/0006-mon-MgrMonitor-read-cmd-descs-if-empty-on-update_fro.patch
+++ b/patches/0006-mon-MgrMonitor-read-cmd-descs-if-empty-on-update_fro.patch
@@ -1,4 +1,4 @@
-From 246c246ff5d21a7ce589bd306164d51455cfd1a4 Mon Sep 17 00:00:00 2001
+From 9b015f1ad4d9b9912f2b49b65e5349cc1b4c74db Mon Sep 17 00:00:00 2001
 From: Joao Eduardo Luis <joao@suse.de>
 Date: Wed, 20 Sep 2017 17:53:40 +0100
 Subject: [PATCH 6/6] mon/MgrMonitor: read cmd descs if empty on