summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Keiser <john@johnkeiser.com>2016-08-17 11:36:27 -0700
committerJohn Keiser <john@johnkeiser.com>2016-08-17 11:36:27 -0700
commit7d3d7500d16427ed1c594b02b1e631a9b9727119 (patch)
treedcdfa4f1922940710acff64765141eb9202594b4
parente327309c133053dca10392c027f18ed86137eb0c (diff)
downloadchef-7d3d7500d16427ed1c594b02b1e631a9b9727119.tar.gz
Update to latest chefstyle
-rw-r--r--Gemfile.lock2
-rw-r--r--lib/chef/http.rb2
2 files changed, 1 insertions, 3 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 8d8b119bb6..86c733f4c3 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,6 +1,6 @@
GIT
remote: https://github.com/chef/chefstyle.git
- revision: b4c1c5ae0b0ec824a1561523a79c0ff30f167a5e
+ revision: 0f9d895058964f3a14b439bd3216c0785219459f
branch: master
specs:
chefstyle (0.3.1)
diff --git a/lib/chef/http.rb b/lib/chef/http.rb
index ec6665f5c0..0def3378be 100644
--- a/lib/chef/http.rb
+++ b/lib/chef/http.rb
@@ -420,8 +420,6 @@ class Chef
@redirects_followed = 0
end
- private
-
def chef_zero_uri?(uri)
uri = URI.parse(uri) unless uri.respond_to?(:scheme)
uri.scheme == "chefzero"