summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLamont Granquist <lamont@scriptkiddie.org>2016-07-01 17:35:17 -0700
committerGitHub <noreply@github.com>2016-07-01 17:35:17 -0700
commit2b11d6c02d52db008acc99a46afa11646c15e47e (patch)
tree6b76f3d413e147be3154094927c09601e6e3056a
parent721a0a5077c6c7b51b35e5166f49e5f1025222b7 (diff)
parent46e85df91fec2551a45604ff64a5265b9245cba0 (diff)
downloadchef-2b11d6c02d52db008acc99a46afa11646c15e47e.tar.gz
Merge pull request #5074 from tas50/tas50/dep
Update deps to include the latest ohai and chef-zero
-rw-r--r--Gemfile.lock16
1 files changed, 8 insertions, 8 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index f89290658a..d3a8f5f130 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -99,12 +99,12 @@ GEM
mixlib-cli (~> 1.4)
artifactory (2.3.3)
ast (2.3.0)
- aws-sdk (2.3.18)
- aws-sdk-resources (= 2.3.18)
- aws-sdk-core (2.3.18)
+ aws-sdk (2.3.19)
+ aws-sdk-resources (= 2.3.19)
+ aws-sdk-core (2.3.19)
jmespath (~> 1.0)
- aws-sdk-resources (2.3.18)
- aws-sdk-core (= 2.3.18)
+ aws-sdk-resources (2.3.19)
+ aws-sdk-core (= 2.3.19)
aws-sdk-v1 (1.66.0)
json (~> 1.4)
nokogiri (>= 1.4.4)
@@ -131,11 +131,11 @@ GEM
ubuntu_ami (~> 0.4, >= 0.4.1)
chef-rewind (0.0.9)
chef-sugar (3.3.0)
- chef-zero (4.6.2)
+ chef-zero (4.7.0)
ffi-yajl (~> 2.2)
hashie (>= 2.0, < 4.0)
mixlib-log (~> 1.3)
- rack
+ rack (< 2)
uuidtools (~> 2.1)
cheffish (2.0.4)
chef-zero (~> 4.3)
@@ -262,7 +262,7 @@ GEM
rack (>= 1.2, < 3)
octokit (4.3.0)
sawyer (~> 0.7.0, >= 0.5.3)
- ohai (8.17.0)
+ ohai (8.17.1)
chef-config (>= 12.5.0.alpha.1, < 13)
ffi (~> 1.9)
ffi-yajl (~> 2.2)