summaryrefslogtreecommitdiff
path: root/lib/chef/rest.rb
diff options
context:
space:
mode:
authorsersut <serdar@opscode.com>2013-05-31 14:53:17 -0700
committersersut <serdar@opscode.com>2013-05-31 14:53:17 -0700
commite9ba542d3617a9264112cab4744543f662f1e7f5 (patch)
tree9b7d88730d63238351c9c94891ca93e65abc10c7 /lib/chef/rest.rb
parentb9640c7f8968250da6569ddb50ddb616de6c504b (diff)
parent8d6d5ab73f5ee588cafbfc0a41ff3521eb8b1664 (diff)
downloadchef-e9ba542d3617a9264112cab4744543f662f1e7f5.tar.gz
Merge branch 'master' into file-refactor
Conflicts: lib/chef/exceptions.rb
Diffstat (limited to 'lib/chef/rest.rb')
-rw-r--r--lib/chef/rest.rb1
1 files changed, 0 insertions, 1 deletions
diff --git a/lib/chef/rest.rb b/lib/chef/rest.rb
index 37502d44e5..6c74412839 100644
--- a/lib/chef/rest.rb
+++ b/lib/chef/rest.rb
@@ -33,7 +33,6 @@ require 'chef/config'
require 'chef/exceptions'
require 'chef/platform/query_helpers'
-
class Chef
# == Chef::REST
# Chef's custom REST client with built-in JSON support and RSA signed header