# This is a combination of 2 commits.
# The first commit's message is:

stop redis 2.8.x from failing to start due to config on centos

# The 2nd commit message will be skipped:

#	pull personal Vagrantfile
There is no permanent parameter for sysctl module
Fixing redis.conf template, working on CentOS 2.4 for now.
merged all different redis 2.x conf files into redis.conf.erb using redis_version variable
Updating changes and doc
Merge branch 'zxjinn-master' of https://github.com/fsalum/puppet-redis
Add conf_append for custom parameters
change conf_include to an array