diff options
| author | Adam Jacob <adam@opscode.com> | 2010-02-26 15:49:59 -0800 |
|---|---|---|
| committer | Adam Jacob <adam@opscode.com> | 2010-02-26 15:49:59 -0800 |
| commit | cd6152de2ac75f200ada36111159114db24af328 (patch) | |
| tree | fdb9f4d663687ca2127b61195ca692569e23f54f | |
| parent | d7fe6a060a3835e70d4a06d083d7e2da869af5f0 (diff) | |
| parent | d4de519f1d417873423bd09378f47d2d8ea7009e (diff) | |
| download | chef-cd6152de2ac75f200ada36111159114db24af328.tar.gz | |
Merge branch 'CHEF-985' of git://github.com/tfheen/chef into tfheen/CHEF-985
| -rw-r--r-- | chef/config/server.rb | 1 | ||||
| -rw-r--r-- | chef/lib/chef/config.rb | 1 | ||||
| -rw-r--r-- | features/data/config/server.rb | 1 |
3 files changed, 0 insertions, 3 deletions
diff --git a/chef/config/server.rb b/chef/config/server.rb index 22a66edd19..7a76d9022e 100644 --- a/chef/config/server.rb +++ b/chef/config/server.rb @@ -8,7 +8,6 @@ node_path File.join(File.dirname(__FILE__), "..", "examples", "config", "nod file_store_path File.join(File.dirname(__FILE__), "..", "examples", "store") openid_store_path File.join(File.dirname(__FILE__), "..", "examples", "openid-db") openid_cstore_path File.join(File.dirname(__FILE__), "..", "examples", "openid-cstore") -search_index_path File.join(File.dirname(__FILE__), "..", "examples", "search_index") # openid_providers [ "localhost:4001", "openid.hjksolutions.com" ] diff --git a/chef/lib/chef/config.rb b/chef/lib/chef/config.rb index 00890f5d66..5365518713 100644 --- a/chef/lib/chef/config.rb +++ b/chef/lib/chef/config.rb @@ -139,7 +139,6 @@ class Chef rest_timeout 60 run_command_stderr_timeout 120 run_command_stdout_timeout 120 - search_index_path "/var/chef/search_index" search_url "http://localhost:4000" solo false splay nil diff --git a/features/data/config/server.rb b/features/data/config/server.rb index e456bc7e7d..3f2c09a781 100644 --- a/features/data/config/server.rb +++ b/features/data/config/server.rb @@ -17,7 +17,6 @@ cookbook_path [File.join(tmpdir, "cookbooks"), File.join(supportdir, "c cookbook_tarball_path File.join(tmpdir, "cookbook-tarballs") openid_store_path File.join(tmpdir, "openid", "store") openid_cstore_path File.join(tmpdir, "openid", "cstore") -search_index_path File.join(tmpdir, "search_index") role_path File.join(supportdir, "roles") signing_ca_path File.join(tmpdir, "ca") couchdb_database 'chef_integration' |