prepare release 1.5.0

dwerder · dwerder · commit 1f93a41b91d7 · 2015-05-11T15:08:43.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,15 @@
+## 2015-05-11 - 1.6.0 (Feature/Bugfix release)
+
+#### Features:
+
+- Issue #22 Sentinel: add `force_rewrite` parameter for sentinel.conf
+- Issue #22 Sentinel: add parameter `sentinel_pid_dir`
+
+#### Bugfixes:
+
+- Fixes #22 fix sentinel pid and log locations in init script
+- Fixes #23 RedHat: fix stop in initscript (remove signal -QUIT)
+
 ## 2015-04-21 - 1.5.0 (Feature release)
 
 #### Features:
diff --git a/metadata.json b/metadata.json
@@ -30,7 +30,7 @@
     }
   ],
   "name": "dwerder-redis",
-  "version": "1.5.0",
+  "version": "1.6.0",
   "source": "git clone https://github.com/echocat/puppet-redis.git",
   "author": "Daniel Werdermann",
   "license": "MPL-2.0",

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@`
`30`	`30`	`}`
`31`	`31`	`],`
`32`	`32`	`"name": "dwerder-redis",`
`33`		`- "version": "1.5.0",`
	`33`	`+ "version": "1.6.0",`
`34`	`34`	`"source": "git clone https://github.com/echocat/puppet-redis.git",`
`35`	`35`	`"author": "Daniel Werdermann",`
`36`	`36`	`"license": "MPL-2.0",`