Merge branch 'COOK-590'

dokipen · Sep 14, 2011 · 8c0f6d7 · 8c0f6d7
2 parents 7a6fe8f + 57b0b46
commit 8c0f6d7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/rabbitmq/attributes/default.rb b/rabbitmq/attributes/default.rb
@@ -1,6 +1,6 @@
 default[:rabbitmq][:nodename]  = node[:hostname]
 default[:rabbitmq][:address]  = nil
-default[:rabbitmq][:port]  = nil
+default[:rabbitmq][:port]  = 5672
 default[:rabbitmq][:config] = nil
 default[:rabbitmq][:logdir] = nil
 default[:rabbitmq][:mnesiadir] = nil

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