bump version to 12.2.1-pve2

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

diff --git a/patches/0001-update-changelog.patch b/patches/0001-update-changelog.patch
index 377e39a123400a5f67c55eac6b3287407cf45b42..f1e99c7fa14ac8db36fc37135483785fe31ac250 100644 (file)
--- a/patches/0001-update-changelog.patch
+++ b/patches/0001-update-changelog.patch
@@ -1,21 +1,27 @@
-From d2274dc3f5035a9d2bec3d99cd9ddaf7bd491671 Mon Sep 17 00:00:00 2001
+From 76768681ea7bf8584d09751c8af648332dd41895 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/4] 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 | 114 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 114 insertions(+)
+ debian/changelog | 120 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 120 insertions(+)
 
 diff --git a/debian/changelog b/debian/changelog
-index f052439176..ddc7b787d2 100644
+index f052439176..a96ff7923b 100644
 --- a/debian/changelog
 +++ b/debian/changelog
-@@ -1,63 +1,177 @@
+@@ -1,63 +1,183 @@
++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