diff options
| author | AJ Christensen <aj@junglistheavy.industries> | 2014-12-30 11:39:55 +1300 |
|---|---|---|
| committer | Bryan McLellan <btm@opscode.com> | 2015-02-09 21:58:39 -0500 |
| commit | 95be9a0418b8db7b224092ef3e15282b5ae97eee (patch) | |
| tree | 02c5ef4fa4fac28adf1a0abe5033e7b2642b3274 /lib/chef/application/client.rb | |
| parent | 955bce9ed05d6c69a37c506dc9e24a6e407e1a4d (diff) | |
| download | chef-95be9a0418b8db7b224092ef3e15282b5ae97eee.tar.gz | |
Refs #2709: Isolate/fix the no-fork fault
* Share specific recipes code to application parent
* Update specs to passing, update specs to RSpec 3.
* Specs for set_specific_recipes, solo, client.
Diffstat (limited to 'lib/chef/application/client.rb')
| -rw-r--r-- | lib/chef/application/client.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/chef/application/client.rb b/lib/chef/application/client.rb index c0635e1cb5..d5dc936f83 100644 --- a/lib/chef/application/client.rb +++ b/lib/chef/application/client.rb @@ -264,7 +264,7 @@ class Chef::Application::Client < Chef::Application raise Chef::Exceptions::PIDFileLockfileMatch if Chef::Util::PathHelper.paths_eql? (Chef::Config[:pid_file] || '' ), (Chef::Config[:lockfile] || '') - Chef::Config[:specific_recipes] = cli_arguments.map { |file| File.expand_path(file) } + set_specific_recipes Chef::Config[:chef_server_url] = config[:chef_server_url] if config.has_key? :chef_server_url |