From 8d0fe5a3288502e82861c8672b301a656df590a6c1addc5cc1e80be3559abf40 Mon Sep 17 00:00:00 2001 From: Nathan Cutler Date: Fri, 26 Jul 2019 09:47:27 +0000 Subject: [PATCH] Accepting request 718804 from filesystems:ceph:nautilus Upstream v14.2.2 release OBS-URL: https://build.opensuse.org/request/show/718804 OBS-URL: https://build.opensuse.org/package/show/filesystems:ceph/ceph?expand=0&rev=241 --- ceph-14.2.1-475-g83b977ffbd.tar.bz2 | 3 --- ceph-14.2.2-348-gf6da3d1d18.tar.bz2 | 3 +++ ceph-test.changes | 10 ++++++++++ ceph-test.spec | 8 ++++---- ceph.changes | 10 ++++++++++ ceph.spec | 8 ++++---- 6 files changed, 31 insertions(+), 11 deletions(-) delete mode 100644 ceph-14.2.1-475-g83b977ffbd.tar.bz2 create mode 100644 ceph-14.2.2-348-gf6da3d1d18.tar.bz2 diff --git a/ceph-14.2.1-475-g83b977ffbd.tar.bz2 b/ceph-14.2.1-475-g83b977ffbd.tar.bz2 deleted file mode 100644 index 6b0fed9..0000000 --- a/ceph-14.2.1-475-g83b977ffbd.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6261414d57cbcc8d84f9a63906c30bb387ab56ea35d8067452fae71907afc634 -size 95256401 diff --git a/ceph-14.2.2-348-gf6da3d1d18.tar.bz2 b/ceph-14.2.2-348-gf6da3d1d18.tar.bz2 new file mode 100644 index 0000000..7946ff1 --- /dev/null +++ b/ceph-14.2.2-348-gf6da3d1d18.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:934185cf3a71f4402fabce3eed74cc734b44bd14fdb4d1f2f1e978469f86147b +size 95467046 diff --git a/ceph-test.changes b/ceph-test.changes index 24de8fc..4415767 100644 --- a/ceph-test.changes +++ b/ceph-test.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Thu Jul 25 11:48:55 UTC 2019 - Nathan Cutler + +- Update to 14.2.2-348-gf6da3d1d18: + + rebase on top of upstream Nautilus v14.2.2 release, SHA1 4f8fa0a0024755aae7d95567c63f11d6862d55be + + mgr/volumes: add CephFS subvolumes library (bsc#1135205) + + mgr/dashboard: Warn that tcmu-runner backstore is tech-preview (bsc#1137261) + + mgr/dashboard: Add, update and remove translations (bsc#1140737) + + osd/PG: fix cleanup of pgmeta-like objects on PG deletion + ------------------------------------------------------------------- Fri Jul 12 11:27:58 UTC 2019 - Nathan Cutler diff --git a/ceph-test.spec b/ceph-test.spec index 27d951f..6c5f084 100644 --- a/ceph-test.spec +++ b/ceph-test.spec @@ -100,7 +100,7 @@ # main package definition ################################################################################# Name: ceph-test -Version: 14.2.1.475+g83b977ffbd +Version: 14.2.2.348+gf6da3d1d18 Release: 0%{?dist} %if 0%{?fedora} || 0%{?rhel} Epoch: 2 @@ -116,7 +116,7 @@ License: LGPL-2.1 and CC-BY-SA-3.0 and GPL-2.0 and BSL-1.0 and BSD-3-Clause and Group: System/Filesystems %endif URL: http://ceph.com/ -Source0: %{?_remote_tarball_prefix}ceph-14.2.1-475-g83b977ffbd.tar.bz2 +Source0: %{?_remote_tarball_prefix}ceph-14.2.2-348-gf6da3d1d18.tar.bz2 %if 0%{?suse_version} Source96: checkin.sh Source97: README-checkin.txt @@ -504,11 +504,11 @@ This package contains Ceph benchmarks and test tools. %if 0%{?suse_version} %endif %if 0%{?suse_version} -%endif %if 0%{?suse_version} %endif +%endif %prep -%autosetup -p1 -n ceph-14.2.1-475-g83b977ffbd +%autosetup -p1 -n ceph-14.2.2-348-gf6da3d1d18 %build # LTO can be enabled as soon as the following GCC bug is fixed: diff --git a/ceph.changes b/ceph.changes index 24de8fc..4415767 100644 --- a/ceph.changes +++ b/ceph.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Thu Jul 25 11:48:55 UTC 2019 - Nathan Cutler + +- Update to 14.2.2-348-gf6da3d1d18: + + rebase on top of upstream Nautilus v14.2.2 release, SHA1 4f8fa0a0024755aae7d95567c63f11d6862d55be + + mgr/volumes: add CephFS subvolumes library (bsc#1135205) + + mgr/dashboard: Warn that tcmu-runner backstore is tech-preview (bsc#1137261) + + mgr/dashboard: Add, update and remove translations (bsc#1140737) + + osd/PG: fix cleanup of pgmeta-like objects on PG deletion + ------------------------------------------------------------------- Fri Jul 12 11:27:58 UTC 2019 - Nathan Cutler diff --git a/ceph.spec b/ceph.spec index f8ff2bc..e1ed1b6 100644 --- a/ceph.spec +++ b/ceph.spec @@ -100,7 +100,7 @@ # main package definition ################################################################################# Name: ceph -Version: 14.2.1.475+g83b977ffbd +Version: 14.2.2.348+gf6da3d1d18 Release: 0%{?dist} %if 0%{?fedora} || 0%{?rhel} Epoch: 2 @@ -116,7 +116,7 @@ License: LGPL-2.1 and CC-BY-SA-3.0 and GPL-2.0 and BSL-1.0 and BSD-3-Clause and Group: System/Filesystems %endif URL: http://ceph.com/ -Source0: %{?_remote_tarball_prefix}ceph-14.2.1-475-g83b977ffbd.tar.bz2 +Source0: %{?_remote_tarball_prefix}ceph-14.2.2-348-gf6da3d1d18.tar.bz2 %if 0%{?suse_version} # _insert_obs_source_lines_here ExclusiveArch: x86_64 aarch64 ppc64le s390x @@ -1071,7 +1071,6 @@ BuildArch: noarch Group: System/Monitoring %description prometheus-alerts This package provides Ceph’s default alerts for Prometheus. -%endif %package dashboard-e2e Summary: Standalone Ceph Dashboard End-To-End ("E2E") tests @@ -1083,12 +1082,13 @@ Requires: ceph-common = %{_epoch_prefix}%{version}-%{release} %description dashboard-e2e This package provides the Ceph Dashboard End-To-End ("E2E") tests as a standalone RPM for use in Continuous Integration and ad hoc testing. +%endif ################################################################################# # common ################################################################################# %prep -%autosetup -p1 -n ceph-14.2.1-475-g83b977ffbd +%autosetup -p1 -n ceph-14.2.2-348-gf6da3d1d18 %build # LTO can be enabled as soon as the following GCC bug is fixed: