Merge branch 'f17'

Conflicts: sanlock.spec Update to sanlock-2.4
2012-07-23 09:53:54 -05:00 · 2012-07-23 09:53:54 -05:00 · d890df7a8b
commit d890df7a8b
parent bf22c27c77 312c0bc8e7
3 changed files with 7 additions and 3 deletions
--- a/.gitignore
+++ b/.gitignore
@ -8,3 +8,4 @@
 /sanlock-2.1.tar.gz
 /sanlock-2.2.tar.gz
 /sanlock-2.3.tar.gz
+/sanlock-2.4.tar.gz
--- a/sanlock.spec
+++ b/sanlock.spec
@ -1,6 +1,6 @@
 Name:           sanlock
-Version:        2.3
-Release:        4%{?dist}
+Version:        2.4
+Release:        1%{?dist}
 Summary:        A shared disk lock manager

 Group:          System Environment/Base
@ -177,6 +177,9 @@ developing applications that use %{name}.
 %{_includedir}/sanlock_direct.h

 %changelog
+* Mon Jul 23 2012 David Teigland <teigland@redhat.com> - 2.4-1
+- Update to sanlock-2.4
+
 * Sat Jul 21 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.3-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild

--- a/2
+++ b/2
@ -1 +1 @@
-17ddc7c7b9dfab30e82890b6d14cda57  sanlock-2.3.tar.gz
+5d056f13f1bec99c858867910b557380  sanlock-2.4.tar.gz