summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Hain <shain@chef.io>2016-04-25 10:09:32 -0700
committerScott Hain <shain@chef.io>2016-04-25 10:09:32 -0700
commitf4f26d515b377265f2cac4e2db1bc9d3851de0e9 (patch)
tree746607e688429f35bc2d172086e0976f431ea2ba
parent9a1514cddb7196f5d464e9f997a9bddd3427fcbb (diff)
downloadchef-f4f26d515b377265f2cac4e2db1bc9d3851de0e9.tar.gz
Try again
-rw-r--r--.bundle/config1
-rw-r--r--Gemfile.lock8
-rw-r--r--acceptance/Gemfile.lock22
-rw-r--r--kitchen-tests/Gemfile.lock16
-rw-r--r--omnibus/Gemfile.lock24
5 files changed, 35 insertions, 36 deletions
diff --git a/.bundle/config b/.bundle/config
index 7f3d897037..7544be9dd7 100644
--- a/.bundle/config
+++ b/.bundle/config
@@ -1,3 +1,2 @@
---
-BUNDLE_DISABLE_SHARED_GEMS: '1'
BUNDLE_FROZEN: '1'
diff --git a/Gemfile.lock b/Gemfile.lock
index 247ec247b5..95eaf30046 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -200,7 +200,7 @@ GEM
thor
hashie (3.4.3)
highline (1.7.8)
- httpclient (2.7.1)
+ httpclient (2.8.0)
inifile (3.0.0)
iniparse (1.4.2)
ipaddress (0.8.3)
@@ -239,7 +239,7 @@ GEM
win32-process (~> 0.8.2)
wmi-lite (~> 1.0)
mixlib-versioning (1.1.0)
- multi_json (1.11.2)
+ multi_json (1.11.3)
multi_xml (0.5.5)
multipart-post (2.0.0)
net-scp (1.2.1)
@@ -334,7 +334,7 @@ GEM
ruby-progressbar (~> 1.7)
unicode-display_width (~> 1.0, >= 1.0.1)
ruby-prof (0.15.9)
- ruby-progressbar (1.7.5)
+ ruby-progressbar (1.8.0)
ruby-shadow (2.5.0)
rubyntlm (0.6.0)
rufus-lru (1.0.5)
@@ -353,7 +353,7 @@ GEM
simplecov-html (~> 0.10.0)
simplecov-html (0.10.0)
slop (3.6.0)
- specinfra (2.56.1)
+ specinfra (2.57.0)
net-scp
net-ssh (>= 2.7, < 4.0)
net-telnet
diff --git a/acceptance/Gemfile.lock b/acceptance/Gemfile.lock
index 009c7cee73..eefff09c2d 100644
--- a/acceptance/Gemfile.lock
+++ b/acceptance/Gemfile.lock
@@ -11,12 +11,12 @@ GEM
specs:
addressable (2.4.0)
artifactory (2.3.2)
- aws-sdk (2.2.34)
- aws-sdk-resources (= 2.2.34)
- aws-sdk-core (2.2.34)
+ aws-sdk (2.2.36)
+ aws-sdk-resources (= 2.2.36)
+ aws-sdk-core (2.2.36)
jmespath (~> 1.0)
- aws-sdk-resources (2.2.34)
- aws-sdk-core (= 2.2.34)
+ aws-sdk-resources (2.2.36)
+ aws-sdk-core (= 2.2.36)
berkshelf (4.3.2)
addressable (~> 2.3, >= 2.3.4)
berkshelf-api-client (~> 2.0, >= 2.0.2)
@@ -74,8 +74,8 @@ GEM
builder (>= 2.1.2)
hashie (3.4.3)
hitimes (1.2.3)
- httpclient (2.7.1)
- inspec (0.19.1)
+ httpclient (2.7.2)
+ inspec (0.19.3)
json (~> 1.8)
method_source (~> 0.8)
pry (~> 0)
@@ -112,7 +112,7 @@ GEM
rspec-expectations (~> 3.2)
rspec-mocks (~> 3.2)
mixlib-config (2.2.1)
- mixlib-install (1.0.7)
+ mixlib-install (1.0.9)
artifactory
mixlib-shellout
mixlib-versioning
@@ -120,7 +120,7 @@ GEM
mixlib-shellout (2.2.6)
mixlib-versioning (1.1.0)
molinillo (0.4.4)
- multi_json (1.11.2)
+ multi_json (1.11.3)
multipart-post (2.0.0)
net-scp (1.2.1)
net-ssh (>= 2.6.5)
@@ -133,10 +133,10 @@ GEM
coderay (~> 1.1.0)
method_source (~> 0.8.1)
slop (~> 3.4)
- r-train (0.10.5)
+ r-train (0.10.8)
docker-api (~> 1.26.2)
json (~> 1.8)
- mixlib-shellout (~> 2.1)
+ mixlib-shellout (~> 2.0)
net-scp (~> 1.2)
net-ssh (>= 2.9, < 4.0)
winrm (~> 1.6)
diff --git a/kitchen-tests/Gemfile.lock b/kitchen-tests/Gemfile.lock
index 78caba0014..a3d57341e4 100644
--- a/kitchen-tests/Gemfile.lock
+++ b/kitchen-tests/Gemfile.lock
@@ -14,12 +14,12 @@ GEM
specs:
addressable (2.4.0)
artifactory (2.3.2)
- aws-sdk (2.2.34)
- aws-sdk-resources (= 2.2.34)
- aws-sdk-core (2.2.34)
+ aws-sdk (2.2.36)
+ aws-sdk-resources (= 2.2.36)
+ aws-sdk-core (2.2.36)
jmespath (~> 1.0)
- aws-sdk-resources (2.2.34)
- aws-sdk-core (= 2.2.34)
+ aws-sdk-resources (2.2.36)
+ aws-sdk-core (= 2.2.36)
berkshelf (4.3.2)
addressable (~> 2.3, >= 2.3.4)
berkshelf-api-client (~> 2.0, >= 2.0.2)
@@ -69,7 +69,7 @@ GEM
hashie (3.4.3)
hitimes (1.2.3)
hitimes (1.2.3-x86-mingw32)
- httpclient (2.7.1)
+ httpclient (2.7.2)
jmespath (1.2.4)
json_pure (>= 1.8.1)
json (1.8.3)
@@ -84,7 +84,7 @@ GEM
rspec-expectations (~> 3.2)
rspec-mocks (~> 3.2)
mixlib-config (2.2.1)
- mixlib-install (1.0.7)
+ mixlib-install (1.0.9)
artifactory
mixlib-shellout
mixlib-versioning
@@ -95,7 +95,7 @@ GEM
wmi-lite (~> 1.0)
mixlib-versioning (1.1.0)
molinillo (0.4.4)
- multi_json (1.11.2)
+ multi_json (1.11.3)
multipart-post (2.0.0)
net-scp (1.2.1)
net-ssh (>= 2.6.5)
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index 5214847aa1..cb9717694e 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -1,15 +1,15 @@
GIT
remote: https://github.com/chef/omnibus-software.git
- revision: 6127be3af79941c32419228cbd9e63c4f061d76b
+ revision: 5daff60a38f77431a9fad785545f4e095211c0ec
specs:
omnibus-software (4.0.0)
omnibus (>= 5.2.0)
GIT
remote: https://github.com/chef/omnibus.git
- revision: e73722f46fbd5f302d9e1541aaae0b2f8be2110e
+ revision: a83ee04eff7f9d6b609d1ac9c300d3c714513a43
specs:
- omnibus (5.3.0)
+ omnibus (5.4.0)
aws-sdk (~> 2)
chef-sugar (~> 3.3)
cleanroom (~> 1.0)
@@ -38,12 +38,12 @@ GEM
addressable (2.3.8)
artifactory (2.3.2)
awesome_print (1.6.1)
- aws-sdk (2.2.34)
- aws-sdk-resources (= 2.2.34)
- aws-sdk-core (2.2.34)
+ aws-sdk (2.2.36)
+ aws-sdk-resources (= 2.2.36)
+ aws-sdk-core (2.2.36)
jmespath (~> 1.0)
- aws-sdk-resources (2.2.34)
- aws-sdk-core (= 2.2.34)
+ aws-sdk-resources (2.2.36)
+ aws-sdk-core (= 2.2.36)
berkshelf (3.3.0)
addressable (~> 2.3.4)
berkshelf-api-client (~> 1.2)
@@ -132,7 +132,7 @@ GEM
rspec-mocks (~> 3.2)
mixlib-cli (1.5.0)
mixlib-config (2.2.1)
- mixlib-install (1.0.7)
+ mixlib-install (1.0.9)
artifactory
mixlib-shellout
mixlib-versioning
@@ -142,7 +142,7 @@ GEM
win32-process (~> 0.8.2)
wmi-lite (~> 1.0)
mixlib-versioning (1.1.0)
- multi_json (1.11.2)
+ multi_json (1.11.3)
multipart-post (1.2.0)
net-scp (1.2.1)
net-ssh (>= 2.6.5)
@@ -151,7 +151,7 @@ GEM
nori (2.6.0)
octokit (3.8.0)
sawyer (~> 0.6.0, >= 0.5.3)
- ohai (8.14.0)
+ ohai (8.15.1)
chef-config (>= 12.5.0.alpha.1, < 13)
ffi (~> 1.9)
ffi-yajl (~> 2.2)
@@ -203,7 +203,7 @@ GEM
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.4.0)
rspec-support (3.4.1)
- ruby-progressbar (1.7.5)
+ ruby-progressbar (1.8.0)
rubyntlm (0.6.0)
rubyzip (1.2.0)
safe_yaml (1.0.4)