diff options
| author | tyler-ball <tyleraball@gmail.com> | 2014-12-05 18:06:55 -0800 |
|---|---|---|
| committer | tyler-ball <tyleraball@gmail.com> | 2014-12-05 18:06:55 -0800 |
| commit | 091001ae8d27a8a5de03af2c20905e23a8ffefb7 (patch) | |
| tree | 28abfa5821f80e2090b8f89988a0bab004b710a5 /lib/chef/config.rb | |
| parent | 8a7b450cb87ef62e9f21d32c91a52accefba6ffd (diff) | |
| parent | a45716b67a2168c21b166e4aab38668e9b96d856 (diff) | |
| download | chef-091001ae8d27a8a5de03af2c20905e23a8ffefb7.tar.gz | |
Merge branch 'master' into merging-mastermerging-master
Conflicts:
lib/chef/version.rb
Diffstat (limited to 'lib/chef/config.rb')
| -rw-r--r-- | lib/chef/config.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/chef/config.rb b/lib/chef/config.rb index 2a9d44a3c5..957db845b0 100644 --- a/lib/chef/config.rb +++ b/lib/chef/config.rb @@ -271,7 +271,7 @@ class Chef # * :fatal # These work as you'd expect. There is also a special `:auto` setting. # When set to :auto, Chef will auto adjust the log verbosity based on - # context. When a tty is available (usually becase the user is running chef + # context. When a tty is available (usually because the user is running chef # in a console), the log level is set to :warn, and output formatters are # used as the primary mode of output. When a tty is not available, the # logger is the primary mode of output, and the log level is set to :info @@ -317,6 +317,7 @@ class Chef default :why_run, false default :color, false default :client_fork, true + default :ez, false default :enable_reporting, true default :enable_reporting_url_fatals, false # Possible values for :audit_mode @@ -635,7 +636,7 @@ class Chef # # For example, on CentOS 6 with ENV['LANG'] = "en_US.UTF-8", # `locale -a`.split fails with ArgumentError invalid UTF-8 encoding. - locales = shell_out_with_systems_locale("locale -a").stdout.split + locales = shell_out_with_systems_locale!("locale -a").stdout.split case when locales.include?('C.UTF-8') 'C.UTF-8' |