Merge branch 'f18' into f17

This commit is contained in:
Silas Sewell 2012-12-27 09:35:57 -05:00
commit c3cf5fefe5
4 changed files with 18 additions and 15 deletions

1
.gitignore vendored
View File

@ -9,3 +9,4 @@
/redis-2.4.10.tar.gz /redis-2.4.10.tar.gz
/redis-2.4.13.tar.gz /redis-2.4.13.tar.gz
/redis-2.4.15.tar.gz /redis-2.4.15.tar.gz
/redis-2.6.7.tar.gz

View File

@ -1,6 +1,7 @@
--- redis-2.4.6/redis.conf.orig 2012-01-13 09:01:20.032263652 +0100 diff -up redis-2.6.7/redis.conf.orig redis-2.6.7/redis.conf
+++ redis-2.4.6/redis.conf 2012-01-13 09:02:57.223037913 +0100 --- redis-2.6.7/redis.conf.orig 2012-12-27 07:54:11.772560595 -0500
@@ -18,7 +18,7 @@ +++ redis-2.6.7/redis.conf 2012-12-27 07:56:12.818571232 -0500
@@ -18,7 +18,7 @@ daemonize no
# When running daemonized, Redis writes a pid file in /var/run/redis.pid by # When running daemonized, Redis writes a pid file in /var/run/redis.pid by
# default. You can specify a custom pid file location here. # default. You can specify a custom pid file location here.
@ -9,7 +10,7 @@
# Accept connections on the specified port, default is 6379. # Accept connections on the specified port, default is 6379.
# If port 0 is specified Redis will not listen on a TCP socket. # If port 0 is specified Redis will not listen on a TCP socket.
@@ -27,7 +27,7 @@ @@ -27,7 +27,7 @@ port 6379
# If you want you can bind a single interface, if the bind option is not # If you want you can bind a single interface, if the bind option is not
# specified all the interfaces will listen for incoming connections. # specified all the interfaces will listen for incoming connections.
# #
@ -18,13 +19,7 @@
# Specify the path for the unix socket that will be used to listen for # Specify the path for the unix socket that will be used to listen for
# incoming connections. There is no default, so Redis will not listen # incoming connections. There is no default, so Redis will not listen
@@ -45,12 +45,12 @@ @@ -50,7 +50,7 @@ loglevel notice
# verbose (many rarely useful info, but not a mess like the debug level)
# notice (moderately verbose, what you want in production probably)
# warning (only very important / critical messages are logged)
-loglevel verbose
+loglevel notice
# Specify the log file name. Also 'stdout' can be used to force # Specify the log file name. Also 'stdout' can be used to force
# Redis to log on the standard output. Note that if you use standard # Redis to log on the standard output. Note that if you use standard
# output for logging but daemonize, logs will be sent to /dev/null # output for logging but daemonize, logs will be sent to /dev/null
@ -33,7 +28,7 @@
# To enable logging to the system logger, just set 'syslog-enabled' to yes, # To enable logging to the system logger, just set 'syslog-enabled' to yes,
# and optionally update the other syslog parameters to suit your needs. # and optionally update the other syslog parameters to suit your needs.
@@ -104,7 +104,7 @@ @@ -134,7 +134,7 @@ dbfilename dump.rdb
# Also the Append Only File will be created inside this directory. # Also the Append Only File will be created inside this directory.
# #
# Note that you must specify a directory here, not a file name. # Note that you must specify a directory here, not a file name.

View File

@ -7,8 +7,8 @@
%endif %endif
Name: redis Name: redis
Version: 2.4.15 Version: 2.6.7
Release: 2%{?dist} Release: 1%{?dist}
Summary: A persistent key-value database Summary: A persistent key-value database
Group: Applications/Databases Group: Applications/Databases
@ -19,7 +19,7 @@ Source1: %{name}.logrotate
Source2: %{name}.init Source2: %{name}.init
Source3: %{name}.service Source3: %{name}.service
# Update configuration for Fedora # Update configuration for Fedora
Patch0: %{name}-2.4.6-redis.conf.patch Patch0: %{name}-2.6.7-redis.conf.patch
BuildRequires: systemd-units BuildRequires: systemd-units
%if !0%{?el5} %if !0%{?el5}
@ -114,6 +114,12 @@ fi
%{_unitdir}/%{name}.service %{_unitdir}/%{name}.service
%changelog %changelog
* Thu Dec 27 2012 Silas Sewell <silas@sewell.org> - 2.6.7-1
- Update to redis 2.6.7
* Sat Jul 21 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.4.15-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
* Sun Jul 08 2012 Silas Sewell <silas@sewell.org> - 2.4.15-2 * Sun Jul 08 2012 Silas Sewell <silas@sewell.org> - 2.4.15-2
- Remove TODO from docs - Remove TODO from docs

View File

@ -4,3 +4,4 @@ ac776d25f238b142d3d526cfcdc621ab redis-2.4.8.tar.gz
71938de99cbb4fdefd74d7571831fa28 redis-2.4.10.tar.gz 71938de99cbb4fdefd74d7571831fa28 redis-2.4.10.tar.gz
f8a160f8a6fe7d7e8ebb4c23ff583d71 redis-2.4.13.tar.gz f8a160f8a6fe7d7e8ebb4c23ff583d71 redis-2.4.13.tar.gz
ef273152151c3f905d284cbdbbdb234c redis-2.4.15.tar.gz ef273152151c3f905d284cbdbbdb234c redis-2.4.15.tar.gz
9c3db210faff9fea3c17f2b71c2760f4 redis-2.6.7.tar.gz