Merge branch 'CHEF-2218'

jsmestad · Apr 26, 2011 · 8ff3107 · 8ff3107
2 parents 5d0b9d6 + 58a5cf8
commit 8ff3107
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/chef/lib/chef/application/client.rb b/chef/lib/chef/application/client.rb
@@ -128,6 +128,11 @@ class Chef::Application::Client < Chef::Application
     :description  => "Set the client key file location",
     :proc         => nil
 
+  option :environment,
+    :short        => '-E ENVIRONMENT',
+    :long         => '--environment ENVIRONMENT',
+    :description  => 'Set the Chef Environment on the node'
+
   option :version,
     :short        => "-v",
     :long         => "--version",