Merge branch 'master' into f23

redis-shutdown

@@ -17,6 +17,7 @@ CONFIG_FILE="/etc/$SERVICE_NAME.conf"
 # Use awk to retrieve host, port from config file
 HOST=`awk '/^[[:blank:]]*bind/ { print $2 }' $CONFIG_FILE`
 PORT=`awk '/^[[:blank:]]*port/ { print $2 }' $CONFIG_FILE`
+PASS=`awk '/^[[:blank:]]*requirepass/ { print $2 }' $CONFIG_FILE`
 
 # Just in case, use default host, port
 HOST=${HOST:-127.0.0.1}
@@ -26,5 +27,9 @@ else
     PORT=${PORT:-26739}
 fi
 
+# Setup additional parameters
+# e.g password-protected redis instances
+[ -z "$PASS"  ] || ADDITIONAL_PARAMS="-a $PASS"
+
 # shutdown the service properly
-$REDIS_CLI -h $HOST -p $PORT shutdown
+$REDIS_CLI -h $HOST -p $PORT $ADDITIONAL_PARAMS shutdown

redis.spec

@@ -12,7 +12,7 @@
 
 Name:              redis
 Version:           3.0.6
-Release:           1%{?dist}
+Release:           3%{?dist}
 Summary:           A persistent key-value database
 License:           BSD
 URL:               http://redis.io
@@ -243,6 +243,12 @@ fi
 
 
 %changelog
+* Mon Feb  8 2016 Haïkel Guémar <hguemar@fedoraproject.org> - 3.0.6-3
+- Fix redis-shutdown to handle password-protected instances shutdown
+
+* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.6-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
 * Sat Dec 19 2015 Haïkel Guémar <hguemar@fedoraproject.org> - 3.0.6-1
 - Upstream 3.0.6 (RHBZ#1272281)