From: Fabian Grünbichler Date: Wed, 25 Apr 2018 08:03:10 +0000 (+0200) Subject: bump version to 12.2.5-pve1 X-Git-Url: https://git.proxmox.com/?p=ceph.git;a=commitdiff_plain;h=dfcb7b53b2e4fcd2a5af0240d4975adc711ab96e bump version to 12.2.5-pve1 --- diff --git a/patches/0001-update-changelog.patch b/patches/0001-update-changelog.patch index 515b788d5..7b4550e7e 100644 --- a/patches/0001-update-changelog.patch +++ b/patches/0001-update-changelog.patch @@ -8,14 +8,26 @@ Content-Transfer-Encoding: 8bit Signed-off-by: Fabian Grünbichler --- - debian/changelog | 150 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 150 insertions(+) + debian/changelog | 156 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 156 insertions(+) diff --git a/debian/changelog b/debian/changelog -index d8c3290336..2134c74dd3 100644 +index c3a8efa2da..0f04e8ee04 100644 --- a/debian/changelog +++ b/debian/changelog -@@ -1,81 +1,231 @@ +@@ -1,87 +1,243 @@ ++ceph (12.2.5-pve1) stable; urgency=medium ++ ++ * rebase on latest upstream release ++ ++ -- Proxmox Support Team Wed, 25 Apr 2018 09:54:53 +0200 ++ + ceph (12.2.5-1) stable; urgency=medium + + * New upstream release + + -- Ceph Release Team Mon, 23 Apr 2018 16:18:32 +0000 + +ceph (12.2.4-pve1) stable; urgency=medium + + * rebase on latest upstream release diff --git a/patches/0004-enable-LZ4-support.patch b/patches/0004-enable-LZ4-support.patch index 6ab9b23d3..9727a427d 100644 --- a/patches/0004-enable-LZ4-support.patch +++ b/patches/0004-enable-LZ4-support.patch @@ -13,7 +13,7 @@ Signed-off-by: Fabian Grünbichler 2 files changed, 2 insertions(+) diff --git a/debian/control b/debian/control -index 9940e74914..02babc3e9d 100644 +index bdc74471da..bc5d03b0ab 100644 --- a/debian/control +++ b/debian/control @@ -38,6 +38,7 @@ Build-Depends: bc, diff --git a/patches/0006-Revert-debian-control-adjust-ceph-osdomap-kvstore-mo.patch b/patches/0006-Revert-debian-control-adjust-ceph-osdomap-kvstore-mo.patch index df5e26748..6daa05923 100644 --- a/patches/0006-Revert-debian-control-adjust-ceph-osdomap-kvstore-mo.patch +++ b/patches/0006-Revert-debian-control-adjust-ceph-osdomap-kvstore-mo.patch @@ -17,7 +17,7 @@ Signed-off-by: Fabian Grünbichler 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/debian/control b/debian/control -index 02babc3e9d..d70abc9659 100644 +index bc5d03b0ab..902d033098 100644 --- a/debian/control +++ b/debian/control @@ -105,10 +105,10 @@ Recommends: btrfs-tools, @@ -33,7 +33,7 @@ index 02babc3e9d..d70abc9659 100644 python-ceph (<< 0.92-1223), Description: common ceph daemon libraries and management tools Ceph is a massively scalable, open-source, distributed -@@ -206,8 +206,8 @@ Depends: ceph-base (= ${binary:Version}), +@@ -207,8 +207,8 @@ Depends: ceph-base (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}, Recommends: ceph-common, @@ -44,7 +44,7 @@ index 02babc3e9d..d70abc9659 100644 Description: monitor server for the ceph storage system Ceph is a massively scalable, open-source, distributed storage system that runs on commodity hardware and delivers object, -@@ -240,8 +240,8 @@ Depends: ceph-base (= ${binary:Version}), +@@ -241,8 +241,8 @@ Depends: ceph-base (= ${binary:Version}), ${python:Depends}, ${shlibs:Depends}, Recommends: ceph-common (= ${binary:Version}),