Merge branch 'master' into f23

This commit is contained in:
Mark Goodwin 2016-11-16 12:39:24 +11:00
commit 2315fa05ba
3 changed files with 14 additions and 2 deletions

1
.gitignore vendored
View File

@ -121,3 +121,4 @@ pcp-3.3.3-1.src.tar.gz
/pcp-webjs-20160912gitcce8001.src.tar.gz /pcp-webjs-20160912gitcce8001.src.tar.gz
/vector-20160912gitv1.1.1.tar.gz /vector-20160912gitv1.1.1.tar.gz
/pcp-3.11.5.src.tar.gz /pcp-3.11.5.src.tar.gz
/pcp-3.11.6.src.tar.gz

View File

@ -1,6 +1,6 @@
Summary: System-level performance monitoring and performance management Summary: System-level performance monitoring and performance management
Name: pcp Name: pcp
Version: 3.11.5 Version: 3.11.6
%global buildversion 1 %global buildversion 1
Release: %{buildversion}%{?dist} Release: %{buildversion}%{?dist}
@ -1224,8 +1224,10 @@ BuildRequires: libvirt-python3
%else %else
Requires: python-pcp Requires: python-pcp
Requires: libvirt-python python-lxml Requires: libvirt-python python-lxml
%if 0%{?rhel} == 0 || 0%{?rhel} > 5
BuildRequires: libvirt-python BuildRequires: libvirt-python
%endif %endif
%endif
%description pmda-libvirt %description pmda-libvirt
This package contains the PCP Performance Metrics Domain Agent (PMDA) for This package contains the PCP Performance Metrics Domain Agent (PMDA) for
extracting virtualisation statistics from libvirt about behaviour of guest extracting virtualisation statistics from libvirt about behaviour of guest
@ -2335,6 +2337,7 @@ cd
%config(noreplace) %{_confdir}/pmlogger/control.d/local %config(noreplace) %{_confdir}/pmlogger/control.d/local
%dir %attr(0775,pcp,pcp) %{_confdir}/nssdb %dir %attr(0775,pcp,pcp) %{_confdir}/nssdb
%ghost %{_localstatedir}/run/pcp
%{_localstatedir}/lib/pcp/config/pmafm %{_localstatedir}/lib/pcp/config/pmafm
%dir %attr(0775,pcp,pcp) %{_localstatedir}/lib/pcp/config/pmie %dir %attr(0775,pcp,pcp) %{_localstatedir}/lib/pcp/config/pmie
%{_localstatedir}/lib/pcp/config/pmie %{_localstatedir}/lib/pcp/config/pmie
@ -2398,10 +2401,12 @@ cd
%files testsuite %files testsuite
%defattr(-,pcpqa,pcpqa) %defattr(-,pcpqa,pcpqa)
%{_testsdir} %{_testsdir}
%if !%{disable_systemd}
%config(noreplace) %{_sysconfdir}/systemd/system/pmwebd.service.d/pmwebd.conf %config(noreplace) %{_sysconfdir}/systemd/system/pmwebd.service.d/pmwebd.conf
%config(noreplace) %{_sysconfdir}/systemd/system/pmmgr.service.d/pmmgr.conf %config(noreplace) %{_sysconfdir}/systemd/system/pmmgr.service.d/pmmgr.conf
%config(noreplace) %{_sysconfdir}/systemd/system/pmcd.service.d/pmcd.conf %config(noreplace) %{_sysconfdir}/systemd/system/pmcd.service.d/pmcd.conf
%config(noreplace) %{_sysconfdir}/systemd/system/pmproxy.service.d/pmproxy.conf %config(noreplace) %{_sysconfdir}/systemd/system/pmproxy.service.d/pmproxy.conf
%endif
%if !%{disable_microhttpd} %if !%{disable_microhttpd}
%files webapi %files webapi
@ -2699,6 +2704,12 @@ cd
%endif %endif
%changelog %changelog
* Fri Nov 11 2016 Mark Goodwin <mgoodwin@redhat.com> - 3.11.6-1
- Optimize DSO lookups for local context mode startup (BZ 1275293)
- Correct return code for derive metric help text (BZ 1336208)
- Improve pmrep metrics collection via extend_indom (BZ 1377464)
- Fix network.interface.speed value extraction (BZ 1379431)
* Mon Sep 26 2016 Mark Goodwin <mgoodwin@redhat.com> - 3.11.5-1 * Mon Sep 26 2016 Mark Goodwin <mgoodwin@redhat.com> - 3.11.5-1
- Allow systemd-based auto-restart of all daemons (BZ 1365658) - Allow systemd-based auto-restart of all daemons (BZ 1365658)
- Ensure pmieconf and pmlogconf handle empty files (BZ 1249123) - Ensure pmieconf and pmlogconf handle empty files (BZ 1249123)

View File

@ -1,3 +1,3 @@
96a03ce0f879641b86ec901710b7aa3d pcp-3.11.5.src.tar.gz a74cc3eba7b8bb5b53feb35e14f44ea0 pcp-3.11.6.src.tar.gz
286ad4bee0b01fe53b005b9d0bab8a7c pcp-webjs-20160912gitcce8001.src.tar.gz 286ad4bee0b01fe53b005b9d0bab8a7c pcp-webjs-20160912gitcce8001.src.tar.gz
66305b9f97b1f31334a7f85a9048ec34 vector-20160912gitv1.1.1.tar.gz 66305b9f97b1f31334a7f85a9048ec34 vector-20160912gitv1.1.1.tar.gz