diff options
| author | Nathan Williams <nath.e.will@gmail.com> | 2015-10-23 22:19:25 -0700 |
|---|---|---|
| committer | Nathan Williams <nath.e.will@gmail.com> | 2015-10-23 22:19:25 -0700 |
| commit | a58c59460aa6b9cfe0824dabaf6cac0c445d0288 (patch) | |
| tree | daf8cfecdc01e45dd19bd888974b6a75913401c5 /lib/chef/application/client.rb | |
| parent | e6b2a07634f8eef374e1edb84387d69bca3044c1 (diff) | |
| parent | 8bf1304da739d4be94edb101ad9e46c96b1d4ccd (diff) | |
| download | chef-a58c59460aa6b9cfe0824dabaf6cac0c445d0288.tar.gz | |
re-sync with master
Diffstat (limited to 'lib/chef/application/client.rb')
| -rw-r--r-- | lib/chef/application/client.rb | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/lib/chef/application/client.rb b/lib/chef/application/client.rb index 73eda81343..5fac34196d 100644 --- a/lib/chef/application/client.rb +++ b/lib/chef/application/client.rb @@ -2,7 +2,7 @@ # Author:: AJ Christensen (<aj@opscode.com) # Author:: Christopher Brown (<cb@opscode.com>) # Author:: Mark Mzyk (mmzyk@opscode.com) -# Copyright:: Copyright (c) 2008 Opscode, Inc. +# Copyright:: Copyright (c) 2008-2015 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -55,11 +55,17 @@ class Chef::Application::Client < Chef::Application :boolean => true, :default => false + option :profile_ruby, + :long => "--[no-]profile-ruby", + :description => "Dump complete Ruby call graph stack of entire Chef run (expert only)", + :boolean => true, + :default => false + option :color, :long => '--[no-]color', :boolean => true, - :default => !Chef::Platform.windows?, - :description => "Use colored output, defaults to false on Windows, true otherwise" + :default => true, + :description => "Use colored output, defaults to enabled" option :log_level, :short => "-l LEVEL", @@ -160,6 +166,12 @@ class Chef::Application::Client < Chef::Application :description => "Set the client key file location", :proc => nil + option :named_run_list, + :short => "-n NAMED_RUN_LIST", + :long => "--named-run-list NAMED_RUN_LIST", + :description => "Use a policyfile's named run list instead of the default run list", + :default => nil + option :environment, :short => '-E ENVIRONMENT', :long => '--environment ENVIRONMENT', |