merge commit

Author: JJ Asghar

CHANGELOG.md

@@ -2,11 +2,21 @@ rabbitmq Cookbook CHANGELOG
 ===========================
 This file is used to list changes made in each version of the rabbitmq cookbook.
 
+
 v4.1.2 (2015-06-16)
 --------------------
 - Stupid Rubocop
 
-v4.1.1 (2015-06-16)
+v4.1.1 (2015-07-17)
+--------------------
+- Allow for flexiable SSL cipher formats #280
+- Use gsub instead of gsub! #284
+- Support rabbitmq_user with multiple vhosts. #279
+- Fix exception when first node is launched. Fixes issue #285 #286
+- Allow the service to be manually managed #281
+- Fix user_has_tag? issue when name and tag are the same #140
+
+v4.0.1 (2015-06-16)
 --------------------
 - Fix single quote and nil issues with cluster recipe #274
 - Fixed 'rabbitmqctl eval' command for old rabbitmq versions #272