Merge pull request #9 from mattray/COOK-1386

COOK-1386
rabbitmq · Jun 25, 2012 · 804e882 · 804e882
2 parents 851bf3a + 9e06cde
commit 804e882
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## v1.4.1:
+* [COOK-1386] - Bumped version to 2.8.4
+* rabbitmq::default now includes erlang::default
+
 ## v1.4.0:
 
 * [COOK-911] - Auto clustering support

diff --git a/attributes/default.rb b/attributes/default.rb
@@ -6,9 +6,9 @@
 default[:rabbitmq][:logdir] = nil
 default[:rabbitmq][:mnesiadir] = nil
 
-# RabbitMQ version to install for "redhat", "centos", "scientific", and "amazon". We default to 
+# RabbitMQ version to install for "redhat", "centos", "scientific", and "amazon". We default to
 # 2.6.1, because that was what was installed in the previous version of the cookbook.
-default[:rabbitmq][:version] = '2.6.1'
+default[:rabbitmq][:version] = '2.8.4'
 
 # config file location
 # http://www.rabbitmq.com/configure.html#define-environment-variables

diff --git a/metadata.rb b/metadata.rb
@@ -2,7 +2,7 @@
 maintainer_email  "cookbooks@opscode.com"
 license           "Apache 2.0"
 description       "Installs and configures RabbitMQ server"
-version           "1.4.0"
+version           "1.4.1"
 recipe            "rabbitmq", "Install and configure RabbitMQ"
 recipe            "rabbitmq::cluster", "Set up RabbitMQ clustering."
 depends           "apt", ">= 1.1"

diff --git a/recipes/default.rb b/recipes/default.rb
@@ -23,6 +23,8 @@
 # while still using /etc/init.d/rabbitmq-server start
 # because of this we just put the rabbitmq-env.conf in place and let it rip
 
+include_recipe "erlang::default"
+
 directory "/etc/rabbitmq/" do
   owner "root"
   group "root"