summaryrefslogtreecommitdiff
path: root/chef/lib/chef/config.rb
diff options
context:
space:
mode:
authorAdam Jacob <adam@opscode.com>2009-09-12 15:25:20 -0700
committerAdam Jacob <adam@opscode.com>2009-09-12 15:25:20 -0700
commita54a032816261c16dc716de8f77a9d1fb3ce04a9 (patch)
tree463a417ef8d95f2a4d4a5c06236a8948f1bfe645 /chef/lib/chef/config.rb
parent3dfa1e85c4d6e7039cfc34708128934d47fd9476 (diff)
parenta036e7d48f3445997da0fa855acbf8396f3865e1 (diff)
downloadchef-a54a032816261c16dc716de8f77a9d1fb3ce04a9.tar.gz
Merge branch '0.8-alpha' into chef-536
Diffstat (limited to 'chef/lib/chef/config.rb')
-rw-r--r--chef/lib/chef/config.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/chef/lib/chef/config.rb b/chef/lib/chef/config.rb
index 1f9bdf0a80..e00c206805 100644
--- a/chef/lib/chef/config.rb
+++ b/chef/lib/chef/config.rb
@@ -145,6 +145,7 @@ class Chef
nanite_pass 'testing'
nanite_vhost '/nanite'
nanite_identity nil
+ nanite_persistent_mapper false
client_key "/etc/chef/client.pem"
validation_key "/etc/chef/validation.pem"