Sync with upstream resource-agents to pull in new clvm agent

This commit is contained in:
David Vossel 2014-04-30 09:26:03 -05:00
parent 57aff16e56
commit 23720276ab
3 changed files with 7 additions and 3 deletions

1
.gitignore vendored
View File

@ -12,3 +12,4 @@ resource-agents-3.0.14.tar.bz2
/resource-agents-3.9.5.tar.gz /resource-agents-3.9.5.tar.gz
/ClusterLabs-resource-agents-5434e96.tar.gz /ClusterLabs-resource-agents-5434e96.tar.gz
/ClusterLabs-resource-agents-614b55f.tar.gz /ClusterLabs-resource-agents-614b55f.tar.gz
/ClusterLabs-resource-agents-39c1f6e.tar.gz

View File

@ -20,7 +20,7 @@
# #
%global upstream_prefix ClusterLabs-resource-agents %global upstream_prefix ClusterLabs-resource-agents
%global upstream_version 614b55f %global upstream_version 39c1f6e
# SSLeay (required by ldirectord) # SSLeay (required by ldirectord)
%if 0%{?suse_version} %if 0%{?suse_version}
@ -36,7 +36,7 @@
Name: resource-agents Name: resource-agents
Summary: Open Source HA Reusable Cluster Resource Scripts Summary: Open Source HA Reusable Cluster Resource Scripts
Version: 3.9.5 Version: 3.9.5
Release: 11%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist} Release: 12%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}
License: GPLv2+ and LGPLv2+ License: GPLv2+ and LGPLv2+
URL: https://github.com/ClusterLabs/resource-agents URL: https://github.com/ClusterLabs/resource-agents
%if 0%{?fedora} || 0%{?centos_version} || 0%{?rhel} %if 0%{?fedora} || 0%{?centos_version} || 0%{?rhel}
@ -300,6 +300,9 @@ ccs_update_schema > /dev/null 2>&1 ||:
%endif %endif
%changelog %changelog
* Wed Apr 30 2014 David Vossel <dvossel@redhat.com> - 3.9.5-12
- Sync with latest upstream.
* Thu Jan 2 2014 David Vossel <dvossel@redhat.com> - 3.9.5-11 * Thu Jan 2 2014 David Vossel <dvossel@redhat.com> - 3.9.5-11
- Sync with latest upstream. - Sync with latest upstream.

View File

@ -1 +1 @@
0ed73f27352061d18749c9cd36b3d944 ClusterLabs-resource-agents-614b55f.tar.gz 0db69fa8abfdba2cbc0fa835056ef6de ClusterLabs-resource-agents-39c1f6e.tar.gz