diff --git a/ceph-16.2.4-26-g555d38aa5a5.tar.bz2 b/ceph-16.2.4-26-g555d38aa5a5.tar.bz2 deleted file mode 100644 index 5da3c02..0000000 --- a/ceph-16.2.4-26-g555d38aa5a5.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d7ac1786be914d358b04c3bf47e90e36362983a7f4344806f2b4610df47550f9 -size 126794830 diff --git a/ceph-16.2.5-29-g97c2c82c2f5.tar.bz2 b/ceph-16.2.5-29-g97c2c82c2f5.tar.bz2 new file mode 100644 index 0000000..c190445 --- /dev/null +++ b/ceph-16.2.5-29-g97c2c82c2f5.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:910e5124168e4c51901153e9ec6d713514ad9584e1b9f031c3bb6209c7a12c25 +size 127010740 diff --git a/ceph-test.changes b/ceph-test.changes index 1ee9a75..27c171f 100644 --- a/ceph-test.changes +++ b/ceph-test.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Thu Jul 8 19:37:59 UTC 2021 - Nathan Cutler + +- Update to 16.2.5-29-g97c2c82c2f5: + + rebased on top of upstream commit SHA1 0883bdea7337b95e4b611c768c0279868462204a + upstream 16.2.5 release + https://ceph.io/releases/v16-2-5-pacific-released/ + + cherry-pick fix for bsc#1188111: + * include/denc: include used header + * mon,osd: always init local variable + * common/Formatter: include used header + +------------------------------------------------------------------- +Sat Jun 26 08:44:14 UTC 2021 - Nathan Cutler + +- Update to 16.2.4-564-g9689286366a: + + rebased on top of upstream commit SHA1 e57defcbcc91e67aac958c4a52d657a7a907e8ef + ------------------------------------------------------------------- Thu Jun 24 19:10:24 UTC 2021 - Nathan Cutler diff --git a/ceph-test.spec b/ceph-test.spec index f1d6fa1..ef8a213 100644 --- a/ceph-test.spec +++ b/ceph-test.spec @@ -123,7 +123,7 @@ # main package definition ################################################################################# Name: ceph-test -Version: 16.2.4.26+g555d38aa5a5 +Version: 16.2.5.29+g97c2c82c2f5 Release: 0%{?dist} %if 0%{?fedora} || 0%{?rhel} Epoch: 2 @@ -139,7 +139,7 @@ License: LGPL-2.1 and LGPL-3.0 and CC-BY-SA-3.0 and GPL-2.0 and BSL-1.0 and BSD- Group: System/Filesystems %endif URL: http://ceph.com/ -Source0: %{?_remote_tarball_prefix}ceph-16.2.4-26-g555d38aa5a5.tar.bz2 +Source0: %{?_remote_tarball_prefix}ceph-16.2.5-29-g97c2c82c2f5.tar.bz2 %if 0%{?suse_version} Source94: ceph-rpmlintrc Source95: checkin.sh @@ -592,7 +592,7 @@ This package contains Ceph benchmarks and test tools. %if 0%{?suse_version} %endif %prep -%autosetup -p1 -n ceph-16.2.4-26-g555d38aa5a5 +%autosetup -p1 -n ceph-16.2.5-29-g97c2c82c2f5 %build # LTO can be enabled as soon as the following GCC bug is fixed: @@ -934,6 +934,7 @@ rm -rf %{buildroot}%{_datadir}/ceph/mgr/iostat rm -rf %{buildroot}%{_datadir}/ceph/mgr/localpool rm -rf %{buildroot}%{_datadir}/ceph/mgr/mds_autoscaler rm -rf %{buildroot}%{_datadir}/ceph/mgr/mirroring +rm -rf %{buildroot}%{_datadir}/ceph/mgr/nfs rm -rf %{buildroot}%{_datadir}/ceph/mgr/orchestrator rm -rf %{buildroot}%{_datadir}/ceph/mgr/osd_perf_query rm -rf %{buildroot}%{_datadir}/ceph/mgr/osd_support diff --git a/ceph.changes b/ceph.changes index 1ee9a75..27c171f 100644 --- a/ceph.changes +++ b/ceph.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Thu Jul 8 19:37:59 UTC 2021 - Nathan Cutler + +- Update to 16.2.5-29-g97c2c82c2f5: + + rebased on top of upstream commit SHA1 0883bdea7337b95e4b611c768c0279868462204a + upstream 16.2.5 release + https://ceph.io/releases/v16-2-5-pacific-released/ + + cherry-pick fix for bsc#1188111: + * include/denc: include used header + * mon,osd: always init local variable + * common/Formatter: include used header + +------------------------------------------------------------------- +Sat Jun 26 08:44:14 UTC 2021 - Nathan Cutler + +- Update to 16.2.4-564-g9689286366a: + + rebased on top of upstream commit SHA1 e57defcbcc91e67aac958c4a52d657a7a907e8ef + ------------------------------------------------------------------- Thu Jun 24 19:10:24 UTC 2021 - Nathan Cutler diff --git a/ceph.spec b/ceph.spec index 84985a4..6ab0def 100644 --- a/ceph.spec +++ b/ceph.spec @@ -123,7 +123,7 @@ # main package definition ################################################################################# Name: ceph -Version: 16.2.4.26+g555d38aa5a5 +Version: 16.2.5.29+g97c2c82c2f5 Release: 0%{?dist} %if 0%{?fedora} || 0%{?rhel} Epoch: 2 @@ -139,7 +139,7 @@ License: LGPL-2.1 and LGPL-3.0 and CC-BY-SA-3.0 and GPL-2.0 and BSL-1.0 and BSD- Group: System/Filesystems %endif URL: http://ceph.com/ -Source0: %{?_remote_tarball_prefix}ceph-16.2.4-26-g555d38aa5a5.tar.bz2 +Source0: %{?_remote_tarball_prefix}ceph-16.2.5-29-g97c2c82c2f5.tar.bz2 %if 0%{?suse_version} # _insert_obs_source_lines_here ExclusiveArch: x86_64 aarch64 ppc64le s390x @@ -1209,7 +1209,7 @@ This package provides Ceph default alerts for Prometheus. # common ################################################################################# %prep -%autosetup -p1 -n ceph-16.2.4-26-g555d38aa5a5 +%autosetup -p1 -n ceph-16.2.5-29-g97c2c82c2f5 %build # LTO can be enabled as soon as the following GCC bug is fixed: @@ -1775,6 +1775,7 @@ fi %{_datadir}/ceph/mgr/localpool %{_datadir}/ceph/mgr/mds_autoscaler %{_datadir}/ceph/mgr/mirroring +%{_datadir}/ceph/mgr/nfs %{_datadir}/ceph/mgr/orchestrator %{_datadir}/ceph/mgr/osd_perf_query %{_datadir}/ceph/mgr/osd_support