Merge branch 'CHEF-1081' of git://github.com/danielsdeleo/chef into danielsdeleo/CHEF-1081

adamhjk · adamhjk · commit 8b01b9619758 · 2010-03-31T14:44:54.000-07:00
diff --git a/chef/lib/chef/config.rb b/chef/lib/chef/config.rb
@@ -168,7 +168,7 @@ def self.manage_secret_key
 amqp_vhost '/chef'
 # Setting this to a UUID string also makes the queue durable 
 # (persist across rabbitmq restarts)
- amqp_consumer_id nil
+ amqp_consumer_id "default"
 
 client_key "/etc/chef/client.pem"
 validation_key "/etc/chef/validation.pem"

-Original file line number
+Diff line change
 amqp_vhost'/chef'
 # Setting this to a UUID string also makes the queue durable
 # (persist across rabbitmq restarts)
 -amqp_consumer_idnil
 +amqp_consumer_id"default"
 client_key"/etc/chef/client.pem"
 validation_key"/etc/chef/validation.pem"