16.2.8 GA
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
This commit is contained in:
parent
8c6b1da0a2
commit
5e20b9c764
|
@ -19,26 +19,6 @@
|
|||
}
|
||||
}
|
||||
|
||||
--- ceph-16.2.7/src/common/dout.h.orig 2022-01-18 08:58:11.805226954 -0500
|
||||
+++ ceph-16.2.7/src/common/dout.h 2022-01-19 08:06:23.987388663 -0500
|
||||
@@ -99,11 +99,15 @@
|
||||
template<typename T>
|
||||
struct dynamic_marker_t {
|
||||
T value;
|
||||
- operator T() const { return value; }
|
||||
+ // constexpr ctor isn't needed as it's an aggregate type
|
||||
+ constexpr operator T() const { return value; }
|
||||
};
|
||||
|
||||
template<typename T>
|
||||
-dynamic_marker_t<T> need_dynamic(T&& t) {
|
||||
+constexpr dynamic_marker_t<T> need_dynamic(T&& t) {
|
||||
+ // deprecated in C++17 but that's fine for testing
|
||||
+ static_assert(std::is_literal_type_v<T>);
|
||||
+ static_assert(std::is_literal_type_v<dynamic_marker_t<T>>);
|
||||
return dynamic_marker_t<T>{ std::forward<T>(t) };
|
||||
}
|
||||
|
||||
--- ceph-16.2.7/src/test/librados/tier_cxx.cc.orig 2022-01-19 09:30:47.209459506 -0500
|
||||
+++ ceph-16.2.7/src/test/librados/tier_cxx.cc 2022-01-19 10:02:47.783240298 -0500
|
||||
@@ -114,7 +114,7 @@
|
||||
|
|
16
ceph.spec
16
ceph.spec
|
@ -129,8 +129,8 @@
|
|||
# main package definition
|
||||
#################################################################################
|
||||
Name: ceph
|
||||
Version: 16.2.7
|
||||
Release: 10%{?dist}
|
||||
Version: 16.2.8
|
||||
Release: 1%{?dist}
|
||||
%if 0%{?fedora} || 0%{?rhel}
|
||||
Epoch: 2
|
||||
%endif
|
||||
|
@ -356,9 +356,9 @@ BuildRequires: lz4-devel >= 1.7
|
|||
%endif
|
||||
# distro-conditional make check dependencies
|
||||
%if 0%{with make_check}
|
||||
BuildRequires: golang
|
||||
%if 0%{?fedora} || 0%{?rhel}
|
||||
BuildRequires: golang-github-prometheus
|
||||
BuildRequires: jsonnet
|
||||
BuildRequires: libtool-ltdl-devel
|
||||
BuildRequires: xmlsec1
|
||||
BuildRequires: xmlsec1-devel
|
||||
|
@ -376,7 +376,6 @@ BuildRequires: python%{python3_pkgversion}-pyOpenSSL
|
|||
%endif
|
||||
%if 0%{?suse_version}
|
||||
BuildRequires: golang-github-prometheus-prometheus
|
||||
BuildRequires: jsonnet
|
||||
BuildRequires: libxmlsec1-1
|
||||
BuildRequires: libxmlsec1-nss1
|
||||
BuildRequires: libxmlsec1-openssl1
|
||||
|
@ -1478,7 +1477,7 @@ mkdir -p %{buildroot}%{_localstatedir}/lib/ceph/bootstrap-rbd
|
|||
mkdir -p %{buildroot}%{_localstatedir}/lib/ceph/bootstrap-rbd-mirror
|
||||
|
||||
# prometheus alerts
|
||||
install -m 644 -D monitoring/prometheus/alerts/ceph_default_alerts.yml %{buildroot}/etc/prometheus/ceph/ceph_default_alerts.yml
|
||||
install -m 644 -D monitoring/ceph-mixin/prometheus_alerts.yml %{buildroot}/etc/prometheus/ceph/ceph_default_alerts.yml
|
||||
|
||||
%if 0%{?suse_version}
|
||||
# create __pycache__ directories and their contents
|
||||
|
@ -1594,7 +1593,7 @@ exit 0
|
|||
%{_mandir}/man8/cephadm.8*
|
||||
%attr(0700,cephadm,cephadm) %dir %{_sharedstatedir}/cephadm
|
||||
%attr(0700,cephadm,cephadm) %dir %{_sharedstatedir}/cephadm/.ssh
|
||||
%attr(0600,cephadm,cephadm) %{_sharedstatedir}/cephadm/.ssh/authorized_keys
|
||||
%config(noreplace) %attr(0600,cephadm,cephadm) %{_sharedstatedir}/cephadm/.ssh/authorized_keys
|
||||
|
||||
%files common
|
||||
%dir %{_docdir}/ceph
|
||||
|
@ -2517,8 +2516,6 @@ exit 0
|
|||
%endif
|
||||
%attr(0755,root,root) %dir %{_sysconfdir}/grafana/dashboards/ceph-dashboard
|
||||
%config %{_sysconfdir}/grafana/dashboards/ceph-dashboard/*
|
||||
%doc monitoring/grafana/dashboards/README
|
||||
%doc monitoring/grafana/README.md
|
||||
|
||||
%files prometheus-alerts
|
||||
%if 0%{?suse_version}
|
||||
|
@ -2528,6 +2525,9 @@ exit 0
|
|||
%config %{_sysconfdir}/prometheus/ceph/ceph_default_alerts.yml
|
||||
|
||||
%changelog
|
||||
* Mon May 16 2022 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:16.2.8-1
|
||||
- 16.2.8 GA
|
||||
|
||||
* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 2:16.2.7-10
|
||||
- Rebuilt for java-17-openjdk as system jdk
|
||||
|
||||
|
|
2
sources
2
sources
|
@ -1 +1 @@
|
|||
SHA512 (ceph-16.2.7.tar.gz) = eab047e646970d444acf1064d98237b8b1677fb16b5e771082d55880f7bc6d8bdb278c2fe514c82ae12c438878d9ecea29139fa6b8d890f9f737138f10fb740c
|
||||
SHA512 (ceph-16.2.8.tar.gz) = 5ea3857d6ba401d3ac969d95eaed4ea9f43bba1dc25b1c84a9ca14420d790413b8eda953edd576341c79d937433adce0c268f2e8bde9137bbd69f4535b0cc740
|
||||
|
|
Loading…
Reference in New Issue