summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2017-01-25 14:22:21 -0800
committerTim Smith <tsmith@chef.io>2017-02-07 09:04:09 +0100
commit0ec5fc7073a5c4a00232d387997d1b6baad9c46b (patch)
tree7b7272d819312fd77acca01622f91ff619ad3d7c
parent07466ee75745cb5966f86c9b05579ec8bb6d1849 (diff)
downloadchef-0ec5fc7073a5c4a00232d387997d1b6baad9c46b.tar.gz
Bump deps to avoid corrupt Gemfile.lock warning
Signed-off-by: Tim Smith <tsmith@chef.io>
-rw-r--r--Gemfile.lock12
-rw-r--r--acceptance/Gemfile.lock23
-rw-r--r--kitchen-tests/Gemfile.lock31
-rw-r--r--omnibus/Gemfile.lock24
4 files changed, 46 insertions, 44 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 00d757a7ac..69405c75d6 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,6 +1,6 @@
GIT
remote: https://github.com/chef/chef-server
- revision: 815b5accf880bb7b7bacb3f1721cb2fbd250a173
+ revision: e5b2c917b7d06d4e09e27bdb09e4e1ad7648e437
specs:
oc-chef-pedant (2.2.0)
activesupport (>= 4.2.7.1, < 6.0)
@@ -65,7 +65,7 @@ PATH
net-sftp (~> 2.1, >= 2.1.2)
net-ssh (>= 2.9, < 5.0)
net-ssh-multi (~> 1.1)
- ohai (>= 8.6.0.alpha.1, < 9)
+ ohai (>= 8.6.0.alpha.1, < 13)
plist (~> 3.2)
proxifier (~> 1.0)
rspec-core (~> 3.5)
@@ -95,7 +95,7 @@ PATH
net-sftp (~> 2.1, >= 2.1.2)
net-ssh (>= 2.9, < 5.0)
net-ssh-multi (~> 1.1)
- ohai (>= 8.6.0.alpha.1, < 9)
+ ohai (>= 8.6.0.alpha.1, < 13)
plist (~> 3.2)
proxifier (~> 1.0)
rspec-core (~> 3.5)
@@ -164,7 +164,7 @@ GEM
net-ssh-gateway (~> 1.2)
winrm-fs (~> 1.0)
chef-sugar (3.4.0)
- chef-zero (5.2.0)
+ chef-zero (5.3.0)
ffi-yajl (~> 2.2)
hashie (>= 2.0, < 4.0)
mixlib-log (~> 1.3)
@@ -296,7 +296,7 @@ GEM
mixlib-log
mixlib-cli (1.7.0)
mixlib-config (2.2.4)
- mixlib-install (2.1.11)
+ mixlib-install (2.1.12)
artifactory
mixlib-shellout
mixlib-versioning
@@ -462,7 +462,7 @@ GEM
simplecov-html (~> 0.10.0)
simplecov-html (0.10.0)
slop (3.6.0)
- specinfra (2.66.7)
+ specinfra (2.66.8)
net-scp
net-ssh (>= 2.7, < 5.0)
net-telnet
diff --git a/acceptance/Gemfile.lock b/acceptance/Gemfile.lock
index b52a1c7a29..e33389f135 100644
--- a/acceptance/Gemfile.lock
+++ b/acceptance/Gemfile.lock
@@ -11,14 +11,14 @@ GEM
specs:
addressable (2.5.0)
public_suffix (~> 2.0, >= 2.0.2)
- artifactory (2.5.1)
- aws-sdk (2.7.0)
- aws-sdk-resources (= 2.7.0)
- aws-sdk-core (2.7.0)
+ artifactory (2.6.0)
+ aws-sdk (2.7.3)
+ aws-sdk-resources (= 2.7.3)
+ aws-sdk-core (2.7.3)
aws-sigv4 (~> 1.0)
jmespath (~> 1.0)
- aws-sdk-resources (2.7.0)
- aws-sdk-core (= 2.7.0)
+ aws-sdk-resources (2.7.3)
+ aws-sdk-core (= 2.7.3)
aws-sigv4 (1.0.0)
berkshelf (4.3.5)
addressable (~> 2.3, >= 2.3.4)
@@ -64,7 +64,7 @@ GEM
cleanroom (1.0.0)
coderay (1.1.1)
diff-lcs (1.3)
- docker-api (1.33.1)
+ docker-api (1.33.2)
excon (>= 0.38.0)
json
erubis (2.7.0)
@@ -77,10 +77,11 @@ GEM
ffi (>= 1.0.1)
gyoku (1.3.1)
builder (>= 2.1.2)
- hashie (3.4.6)
+ hashie (3.5.1)
hitimes (1.2.4)
httpclient (2.7.2)
- inspec (1.9.0)
+ inspec (1.12.0)
+ faraday (>= 0.9.0)
hashie (~> 3.4)
json (>= 1.8, < 3.0)
method_source (~> 0.8)
@@ -115,7 +116,7 @@ GEM
multi_json (~> 1.10)
method_source (0.8.2)
minitar (0.5.4)
- mixlib-archive (0.3.0)
+ mixlib-archive (0.4.1)
mixlib-log
mixlib-authentication (1.4.1)
mixlib-log
@@ -133,7 +134,7 @@ GEM
net-scp (1.2.1)
net-ssh (>= 2.6.5)
net-ssh (4.0.1)
- net-ssh-gateway (1.2.0)
+ net-ssh-gateway (1.3.0)
net-ssh (>= 2.6.5)
nio4r (1.2.1)
nori (2.6.0)
diff --git a/kitchen-tests/Gemfile.lock b/kitchen-tests/Gemfile.lock
index ec235ebcb8..b42042dfda 100644
--- a/kitchen-tests/Gemfile.lock
+++ b/kitchen-tests/Gemfile.lock
@@ -3,16 +3,16 @@ GEM
specs:
addressable (2.5.0)
public_suffix (~> 2.0, >= 2.0.2)
- artifactory (2.5.1)
- aws-sdk (2.7.0)
- aws-sdk-resources (= 2.7.0)
- aws-sdk-core (2.7.0)
+ artifactory (2.6.0)
+ aws-sdk (2.7.3)
+ aws-sdk-resources (= 2.7.3)
+ aws-sdk-core (2.7.3)
aws-sigv4 (~> 1.0)
jmespath (~> 1.0)
- aws-sdk-resources (2.7.0)
- aws-sdk-core (= 2.7.0)
+ aws-sdk-resources (2.7.3)
+ aws-sdk-core (= 2.7.3)
aws-sigv4 (1.0.0)
- berkshelf (5.4.0)
+ berkshelf (5.6.2)
addressable (~> 2.3, >= 2.3.4)
berkshelf-api-client (>= 2.0.2, < 4.0)
buff-config (~> 2.0)
@@ -22,7 +22,7 @@ GEM
faraday (~> 0.9)
httpclient (~> 2.7)
minitar (~> 0.5, >= 0.5.4)
- mixlib-archive (~> 0.1)
+ mixlib-archive (~> 0.4)
octokit (~> 4.0)
retryable (~> 2.0)
ridley (~> 5.0)
@@ -54,7 +54,7 @@ GEM
cleanroom (1.0.0)
coderay (1.1.1)
diff-lcs (1.3)
- docker-api (1.33.1)
+ docker-api (1.33.2)
excon (>= 0.38.0)
json
erubis (2.7.0)
@@ -68,11 +68,12 @@ GEM
ffi (>= 1.0.1)
gyoku (1.3.1)
builder (>= 2.1.2)
- hashie (3.4.6)
+ hashie (3.5.1)
hitimes (1.2.4)
hitimes (1.2.4-x86-mingw32)
httpclient (2.8.3)
- inspec (1.9.0)
+ inspec (1.12.0)
+ faraday (>= 0.9.0)
hashie (~> 3.4)
json (>= 1.8, < 3.0)
method_source (~> 0.8)
@@ -90,7 +91,7 @@ GEM
jmespath (1.3.1)
json (2.0.3)
kitchen-appbundle-updater (0.1.2)
- kitchen-dokken (1.1.0)
+ kitchen-dokken (2.0.11)
docker-api (~> 1.33)
test-kitchen (~> 1.13)
kitchen-ec2 (1.2.0)
@@ -111,12 +112,12 @@ GEM
multi_json (~> 1.10)
method_source (0.8.2)
minitar (0.5.4)
- mixlib-archive (0.3.0)
+ mixlib-archive (0.4.1)
mixlib-log
mixlib-authentication (1.4.1)
mixlib-log
mixlib-config (2.2.4)
- mixlib-install (2.1.10)
+ mixlib-install (2.1.12)
artifactory
mixlib-shellout
mixlib-versioning
@@ -133,7 +134,7 @@ GEM
net-scp (1.2.1)
net-ssh (>= 2.6.5)
net-ssh (4.0.1)
- net-ssh-gateway (1.2.0)
+ net-ssh-gateway (1.3.0)
net-ssh (>= 2.6.5)
nio4r (2.0.0)
nori (2.6.0)
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index a60b85d84a..d52a70b5de 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -1,6 +1,6 @@
GIT
remote: git://github.com/chef/license_scout.git
- revision: 383ad28edeea0f587aee57b969c77a21b7909e77
+ revision: ae7f2412751dcb411d2bb60abe2086d8ae7ae86f
specs:
license_scout (0.1.2)
ffi-yajl (~> 2.2)
@@ -37,15 +37,15 @@ GEM
specs:
addressable (2.5.0)
public_suffix (~> 2.0, >= 2.0.2)
- artifactory (2.5.1)
+ artifactory (2.6.0)
awesome_print (1.7.0)
- aws-sdk (2.7.0)
- aws-sdk-resources (= 2.7.0)
- aws-sdk-core (2.7.0)
+ aws-sdk (2.7.3)
+ aws-sdk-resources (= 2.7.3)
+ aws-sdk-core (2.7.3)
aws-sigv4 (~> 1.0)
jmespath (~> 1.0)
- aws-sdk-resources (2.7.0)
- aws-sdk-core (= 2.7.0)
+ aws-sdk-resources (2.7.3)
+ aws-sdk-core (= 2.7.3)
aws-sigv4 (1.0.0)
berkshelf (4.3.5)
addressable (~> 2.3, >= 2.3.4)
@@ -107,7 +107,7 @@ GEM
ffi (>= 1.0.1)
gyoku (1.3.1)
builder (>= 2.1.2)
- hashie (3.4.6)
+ hashie (3.5.1)
hitimes (1.2.4)
hitimes (1.2.4-x86-mingw32)
httpclient (2.7.2)
@@ -124,13 +124,13 @@ GEM
multi_json (~> 1.10)
method_source (0.8.2)
minitar (0.5.4)
- mixlib-archive (0.3.0)
+ mixlib-archive (0.4.1)
mixlib-log
mixlib-authentication (1.4.1)
mixlib-log
mixlib-cli (1.7.0)
mixlib-config (2.2.4)
- mixlib-install (2.1.10)
+ mixlib-install (2.1.12)
artifactory
mixlib-shellout
mixlib-versioning
@@ -147,13 +147,13 @@ GEM
net-scp (1.2.1)
net-ssh (>= 2.6.5)
net-ssh (4.0.1)
- net-ssh-gateway (1.2.0)
+ net-ssh-gateway (1.3.0)
net-ssh (>= 2.6.5)
nio4r (2.0.0)
nori (2.6.0)
octokit (4.6.2)
sawyer (~> 0.8.0, >= 0.5.3)
- ohai (8.22.1)
+ ohai (8.23.0)
chef-config (>= 12.5.0.alpha.1, < 13)
ffi (~> 1.9)
ffi-yajl (~> 2.2)