summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortylercloke <tylercloke@gmail.com>2015-07-02 11:39:01 -0700
committertylercloke <tylercloke@gmail.com>2015-07-06 14:36:03 -0700
commit7a699b40f5432086a026c46de62bd99e3058b6ea (patch)
treecbb0209afadbc610a6ed99e44f901631b4ab8eb4
parentbd9febad0be3c396e5373158615d93ef1e2033a1 (diff)
downloadchef-7a699b40f5432086a026c46de62bd99e3058b6ea.tar.gz
Cleanup.
-rw-r--r--lib/chef/chef_fs/file_system/chef_server_root_dir.rb2
-rw-r--r--lib/chef/user.rb1
2 files changed, 2 insertions, 1 deletions
diff --git a/lib/chef/chef_fs/file_system/chef_server_root_dir.rb b/lib/chef/chef_fs/file_system/chef_server_root_dir.rb
index 7b2a5e6cb9..4ec4e45c54 100644
--- a/lib/chef/chef_fs/file_system/chef_server_root_dir.rb
+++ b/lib/chef/chef_fs/file_system/chef_server_root_dir.rb
@@ -94,7 +94,7 @@ class Chef
end
def get_json(path)
- Chef::ServerAPI.new(chef_server_url, :client_name => chef_username, :signing_key_filename => chef_private_key).get(path)
+ Chef::ServerAPI.new(chef_server_url, :client_name => chef_username, :signing_key_filename => chef_private_key, :api_version => "0").get(path)
end
def chef_rest_deprecation_method
diff --git a/lib/chef/user.rb b/lib/chef/user.rb
index b1b8d812e8..31ebeda86f 100644
--- a/lib/chef/user.rb
+++ b/lib/chef/user.rb
@@ -21,6 +21,7 @@ require 'chef/mixin/from_file'
require 'chef/mash'
require 'chef/json_compat'
require 'chef/search/query'
+require 'chef/server_api'
# TODO
# DEPRECATION NOTE