Merge branch 'master' into f23

2015-12-19 02:58:00 +01:00 · 2015-12-19 02:58:00 +01:00 · 99bec3fff5
parent 76abac55fa 9aa122a4db
commit 99bec3fff5
3 changed files with 7 additions and 2 deletions
--- a/.gitignore
+++ b/.gitignore
@ -26,3 +26,4 @@
 /redis-3.0.3.tar.gz
 /redis-3.0.4.tar.gz
 /redis-3.0.5.tar.gz
+/redis-3.0.6.tar.gz
--- a/redis.spec
+++ b/redis.spec
@ -11,7 +11,7 @@
 %global with_tests   %{?_with_tests:1}%{!?_with_tests:0}

 Name:              redis
-Version:           3.0.5
+Version:           3.0.6
 Release:           1%{?dist}
 Summary:           A persistent key-value database
 License:           BSD
@ -241,7 +241,11 @@ fi
 %config(noreplace) %{_sysconfdir}/security/limits.d/95-%{name}.conf
 %endif

+
 %changelog
+* Sat Dec 19 2015 Haïkel Guémar <hguemar@fedoraproject.org> - 3.0.6-1
+- Upstream 3.0.6 (RHBZ#1272281)
+
 * Fri Oct 16 2015 Haïkel Guémar <hguemar@fedoraproject.org> - 3.0.5-1
 - Upstream 3.0.5
 - Fix slave/master replication hanging forever in certain case
--- a/2
+++ b/2
@ -1 +1 @@
-c7ba233e5f92ad2f48860c815bb05480  redis-3.0.5.tar.gz
+9a44ea6bff987d2113caea7761730376  redis-3.0.6.tar.gz