Rebase to resource-agents 3.9.6 upstream release

This commit is contained in:
David Vossel 2015-02-13 14:40:32 -06:00
parent b205f7afde
commit ec5fdeb69b
3 changed files with 8 additions and 4 deletions

1
.gitignore vendored
View File

@ -13,3 +13,4 @@ resource-agents-3.0.14.tar.bz2
/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 /ClusterLabs-resource-agents-39c1f6e.tar.gz
/ClusterLabs-resource-agents-1e3e9db.tar.gz

View File

@ -20,7 +20,7 @@
# #
%global upstream_prefix ClusterLabs-resource-agents %global upstream_prefix ClusterLabs-resource-agents
%global upstream_version 39c1f6e %global upstream_version 1e3e9db
# SSLeay (required by ldirectord) # SSLeay (required by ldirectord)
%if 0%{?suse_version} %if 0%{?suse_version}
@ -35,8 +35,8 @@
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.6
Release: 12%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}.2 Release: 1%{?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
* Fri Feb 13 2015 David Vossel <dvossel@redhat.com> - 3.9.6-1
- Rebase to resource-agents 3.9.6 upstream release.
* Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.9.5-12.2 * Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.9.5-12.2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild

View File

@ -1 +1 @@
0db69fa8abfdba2cbc0fa835056ef6de ClusterLabs-resource-agents-39c1f6e.tar.gz 4320bfe86ce811364fb5f1537d42b866 ClusterLabs-resource-agents-1e3e9db.tar.gz