summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2016-10-31 13:17:49 -0700
committerTim Smith <tsmith@chef.io>2016-10-31 13:17:49 -0700
commitc2ef8ff9c96aa179d2e7ad8aaa492aad0a5a40b8 (patch)
treedf235e48e1416ccee88ccd3e0d67a589e790eb6b
parentfc30a44a383f5742236110002580d0c40380718c (diff)
downloadchef-tas50/deps2.tar.gz
Bump deps to pull in latest Ohaitas50/deps2
Signed-off-by: Tim Smith <tsmith@chef.io>
-rw-r--r--Gemfile.lock43
-rw-r--r--acceptance/Gemfile.lock22
-rw-r--r--kitchen-tests/Gemfile.lock26
-rw-r--r--omnibus/Gemfile.lock18
-rw-r--r--omnibus_overrides.rb2
5 files changed, 56 insertions, 55 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 0fdbccca86..f06acc6c4e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,6 +1,6 @@
GIT
remote: https://github.com/chef/chef-server
- revision: 77a662df32c79865b2195cc398d7e121c7048ff3
+ revision: f4a124354730cbd61c14635dca955d385cfa382d
specs:
oc-chef-pedant (2.2.0)
activesupport (>= 4.2.7.1, < 6.0)
@@ -16,11 +16,11 @@ GIT
GIT
remote: https://github.com/chef/chefstyle.git
- revision: 6d24969bd7c5471e089bd47f45e4832d03e9f8a2
+ revision: 71b73a0f481d595bf222e1804c7152d2415f69a4
branch: master
specs:
chefstyle (0.4.0)
- rubocop (= 0.42.0)
+ rubocop (= 0.44.1)
GIT
remote: https://github.com/rubysec/bundler-audit.git
@@ -125,12 +125,12 @@ GEM
mixlib-cli (~> 1.4)
artifactory (2.5.0)
ast (2.3.0)
- aws-sdk (2.6.9)
- aws-sdk-resources (= 2.6.9)
- aws-sdk-core (2.6.9)
+ aws-sdk (2.6.14)
+ aws-sdk-resources (= 2.6.14)
+ aws-sdk-core (2.6.14)
jmespath (~> 1.0)
- aws-sdk-resources (2.6.9)
- aws-sdk-core (= 2.6.9)
+ aws-sdk-resources (2.6.14)
+ aws-sdk-core (= 2.6.14)
aws-sdk-v1 (1.66.0)
json (~> 1.4)
nokogiri (>= 1.4.4)
@@ -166,13 +166,13 @@ GEM
cheffish (4.0.0)
chef-zero (~> 5.0)
net-ssh
- chefspec (5.2.0)
+ chefspec (5.3.0)
chef (>= 12.0)
fauxhai (~> 3.6)
rspec (~> 3.0)
codeclimate-test-reporter (0.6.0)
simplecov (>= 0.7.1, < 1.0.0)
- codecov (0.1.5)
+ codecov (0.1.6)
json
simplecov
url
@@ -195,17 +195,17 @@ GEM
thread_safe (~> 0.3, >= 0.3.1)
diff-lcs (1.2.5)
docile (1.1.5)
- domain_name (0.5.20160826)
+ domain_name (0.5.20161021)
unf (>= 0.0.5, < 1.0.0)
erubis (2.7.0)
ethon (0.9.1)
ffi (>= 1.3.0)
- excon (0.53.0)
+ excon (0.54.0)
faraday (0.9.2)
multipart-post (>= 1.2, < 3)
faraday_middleware (0.10.0)
faraday (>= 0.7.4, < 0.10)
- fauxhai (3.9.0)
+ fauxhai (3.10.0)
net-ssh
ffi (1.9.14)
ffi (1.9.14-x86-mingw32)
@@ -213,7 +213,7 @@ GEM
ffi
ffi-yajl (2.3.0)
libyajl2 (~> 1.2)
- foodcritic (8.0.0)
+ foodcritic (8.1.0)
cucumber-core (>= 1.3)
erubis
nokogiri (>= 1.5, < 2.0)
@@ -278,7 +278,8 @@ GEM
test-kitchen (>= 1.0.0)
kitchen-vagrant (0.20.0)
test-kitchen (~> 1.4)
- knife-windows (1.6.0)
+ knife-windows (1.7.0)
+ winrm (~> 2.1)
winrm-elevated (~> 1.0)
launchy (2.4.3)
addressable (~> 2.3)
@@ -300,7 +301,7 @@ GEM
mixlib-log
mixlib-cli (1.7.0)
mixlib-config (2.2.4)
- mixlib-install (2.1.1)
+ mixlib-install (2.1.5)
artifactory
mixlib-shellout
mixlib-versioning
@@ -342,9 +343,9 @@ GEM
multi_json (~> 1.3)
multi_xml (~> 0.5)
rack (>= 1.2, < 3)
- octokit (4.3.0)
+ octokit (4.4.1)
sawyer (~> 0.7.0, >= 0.5.3)
- ohai (8.20.0)
+ ohai (8.21.0)
chef-config (>= 12.5.0.alpha.1, < 13)
ffi (~> 1.9)
ffi-yajl (~> 2.2)
@@ -445,7 +446,7 @@ GEM
rspec_junit_formatter (0.2.3)
builder (< 4)
rspec-core (>= 2, < 4, != 2.12.0)
- rubocop (0.42.0)
+ rubocop (0.44.1)
parser (>= 2.3.1.1, < 3.0)
powerpack (~> 0.1)
rainbow (>= 1.99.1, < 3.0)
@@ -461,7 +462,7 @@ GEM
sawyer (0.7.0)
addressable (>= 2.3.5, < 2.5)
faraday (~> 0.8, < 0.10)
- serverspec (2.37.1)
+ serverspec (2.37.2)
multi_json
rspec (~> 3.0)
rspec-its
@@ -473,7 +474,7 @@ GEM
simplecov-html (~> 0.10.0)
simplecov-html (0.10.0)
slop (3.6.0)
- specinfra (2.63.3)
+ specinfra (2.64.0)
net-scp
net-ssh (>= 2.7, < 4.0)
net-telnet
diff --git a/acceptance/Gemfile.lock b/acceptance/Gemfile.lock
index 8fc49431b7..4299609f91 100644
--- a/acceptance/Gemfile.lock
+++ b/acceptance/Gemfile.lock
@@ -11,12 +11,12 @@ GEM
specs:
addressable (2.4.0)
artifactory (2.5.0)
- aws-sdk (2.6.9)
- aws-sdk-resources (= 2.6.9)
- aws-sdk-core (2.6.9)
+ aws-sdk (2.6.14)
+ aws-sdk-resources (= 2.6.14)
+ aws-sdk-core (2.6.14)
jmespath (~> 1.0)
- aws-sdk-resources (2.6.9)
- aws-sdk-core (= 2.6.9)
+ aws-sdk-resources (2.6.14)
+ aws-sdk-core (= 2.6.14)
berkshelf (4.3.5)
addressable (~> 2.3, >= 2.3.4)
berkshelf-api-client (~> 2.0, >= 2.0.2)
@@ -65,7 +65,7 @@ GEM
excon (>= 0.38.0)
json
erubis (2.7.0)
- excon (0.53.0)
+ excon (0.54.0)
faraday (0.9.2)
multipart-post (>= 1.2, < 3)
ffi (1.9.14)
@@ -77,7 +77,7 @@ GEM
hashie (3.4.6)
hitimes (1.2.4)
httpclient (2.7.2)
- inspec (1.2.0)
+ inspec (1.3.0)
hashie (~> 3.4)
json (>= 1.8, < 3.0)
method_source (~> 0.8)
@@ -90,7 +90,7 @@ GEM
rubyzip (~> 1.1)
sslshake (~> 1)
thor (~> 0.19)
- train (>= 0.19.1, < 1.0)
+ train (>= 0.20.1, < 1.0)
jmespath (1.3.1)
json (2.0.2)
kitchen-ec2 (1.2.0)
@@ -132,7 +132,7 @@ GEM
net-ssh (>= 2.6.5)
nio4r (1.2.1)
nori (2.6.0)
- octokit (4.3.0)
+ octokit (4.4.1)
sawyer (~> 0.7.0, >= 0.5.3)
parallel (1.9.0)
pry (0.10.4)
@@ -186,7 +186,7 @@ GEM
solve (2.0.3)
molinillo (~> 0.4.2)
semverse (~> 1.1)
- sslshake (1.0.12)
+ sslshake (1.0.13)
test-kitchen (1.13.2)
mixlib-install (>= 1.2, < 3.0)
mixlib-shellout (>= 1.2, < 3.0)
@@ -198,7 +198,7 @@ GEM
thor (0.19.1)
timers (4.0.4)
hitimes
- train (0.20.0)
+ train (0.20.1)
docker-api (~> 1.26)
json (>= 1.8, < 3.0)
mixlib-shellout (~> 2.0)
diff --git a/kitchen-tests/Gemfile.lock b/kitchen-tests/Gemfile.lock
index 7498483862..48231fb189 100644
--- a/kitchen-tests/Gemfile.lock
+++ b/kitchen-tests/Gemfile.lock
@@ -3,12 +3,12 @@ GEM
specs:
addressable (2.4.0)
artifactory (2.5.0)
- aws-sdk (2.6.9)
- aws-sdk-resources (= 2.6.9)
- aws-sdk-core (2.6.9)
+ aws-sdk (2.6.14)
+ aws-sdk-resources (= 2.6.14)
+ aws-sdk-core (2.6.14)
jmespath (~> 1.0)
- aws-sdk-resources (2.6.9)
- aws-sdk-core (= 2.6.9)
+ aws-sdk-resources (2.6.14)
+ aws-sdk-core (= 2.6.14)
berkshelf (5.1.0)
addressable (~> 2.3, >= 2.3.4)
berkshelf-api-client (>= 2.0.2, < 4.0)
@@ -55,7 +55,7 @@ GEM
excon (>= 0.38.0)
json
erubis (2.7.0)
- excon (0.53.0)
+ excon (0.54.0)
faraday (0.9.2)
multipart-post (>= 1.2, < 3)
ffi (1.9.14)
@@ -69,7 +69,7 @@ GEM
hitimes (1.2.4)
hitimes (1.2.4-x86-mingw32)
httpclient (2.8.2.4)
- inspec (1.2.0)
+ inspec (1.3.0)
hashie (~> 3.4)
json (>= 1.8, < 3.0)
method_source (~> 0.8)
@@ -82,7 +82,7 @@ GEM
rubyzip (~> 1.1)
sslshake (~> 1)
thor (~> 0.19)
- train (>= 0.19.1, < 1.0)
+ train (>= 0.20.1, < 1.0)
jmespath (1.3.1)
json (2.0.2)
kitchen-appbundle-updater (0.1.2)
@@ -111,7 +111,7 @@ GEM
mixlib-authentication (1.4.1)
mixlib-log
mixlib-config (2.2.4)
- mixlib-install (2.1.1)
+ mixlib-install (2.1.5)
artifactory
mixlib-shellout
mixlib-versioning
@@ -122,7 +122,7 @@ GEM
win32-process (~> 0.8.2)
wmi-lite (~> 1.0)
mixlib-versioning (1.1.0)
- molinillo (0.5.1)
+ molinillo (0.5.3)
multi_json (1.12.1)
multipart-post (2.0.0)
net-scp (1.2.1)
@@ -132,7 +132,7 @@ GEM
net-ssh (>= 2.6.5)
nio4r (1.2.1)
nori (2.6.0)
- octokit (4.3.0)
+ octokit (4.4.1)
sawyer (~> 0.7.0, >= 0.5.3)
parallel (1.9.0)
pry (0.10.4)
@@ -186,7 +186,7 @@ GEM
solve (3.0.1)
molinillo (~> 0.4)
semverse (>= 1.1, < 3.0)
- sslshake (1.0.12)
+ sslshake (1.0.13)
test-kitchen (1.13.2)
mixlib-install (>= 1.2, < 3.0)
mixlib-shellout (>= 1.2, < 3.0)
@@ -198,7 +198,7 @@ GEM
thor (0.19.1)
timers (4.0.4)
hitimes
- train (0.20.0)
+ train (0.20.1)
docker-api (~> 1.26)
json (>= 1.8, < 3.0)
mixlib-shellout (~> 2.0)
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index 182b723d22..cbd6d96ec6 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -1,6 +1,6 @@
GIT
remote: git://github.com/chef/license_scout.git
- revision: ed2fe16bff7b1b337c3ae23fee8d63cce018303c
+ revision: c6c4a7bbcdbc73733217764db3bd5d278f63533e
specs:
license_scout (0.1.2)
ffi-yajl (~> 2.2)
@@ -17,7 +17,7 @@ GIT
GIT
remote: git://github.com/chef/omnibus.git
- revision: d8a531fd4b95fc73c5c279ba0a53cedd6b2a1196
+ revision: 5b28abc2bf4b74a4bed515a38784a4aae7a72e90
branch: rhass/COOL-502_with_gcc_investigate
specs:
omnibus (5.5.0)
@@ -38,12 +38,12 @@ GEM
addressable (2.4.0)
artifactory (2.5.0)
awesome_print (1.7.0)
- aws-sdk (2.6.11)
- aws-sdk-resources (= 2.6.11)
- aws-sdk-core (2.6.11)
+ aws-sdk (2.6.14)
+ aws-sdk-resources (= 2.6.14)
+ aws-sdk-core (2.6.14)
jmespath (~> 1.0)
- aws-sdk-resources (2.6.11)
- aws-sdk-core (= 2.6.11)
+ aws-sdk-resources (2.6.14)
+ aws-sdk-core (= 2.6.14)
berkshelf (4.3.5)
addressable (~> 2.3, >= 2.3.4)
berkshelf-api-client (~> 2.0, >= 2.0.2)
@@ -127,7 +127,7 @@ GEM
mixlib-log
mixlib-cli (1.7.0)
mixlib-config (2.2.4)
- mixlib-install (2.1.1)
+ mixlib-install (2.1.5)
artifactory
mixlib-shellout
mixlib-versioning
@@ -148,7 +148,7 @@ GEM
net-ssh (>= 2.6.5)
nio4r (1.2.1)
nori (2.6.0)
- octokit (4.3.0)
+ octokit (4.4.1)
sawyer (~> 0.7.0, >= 0.5.3)
ohai (8.21.0)
chef-config (>= 12.5.0.alpha.1, < 13)
diff --git a/omnibus_overrides.rb b/omnibus_overrides.rb
index 24084dd6ba..0d740ff046 100644
--- a/omnibus_overrides.rb
+++ b/omnibus_overrides.rb
@@ -1,5 +1,5 @@
# DO NOT EDIT. Generated by "rake dependencies". Edit version_policy.rb instead.
-override :rubygems, version: "2.6.7"
+override :rubygems, version: "2.6.8"
override :bundler, version: "1.12.5"
override "libffi", version: "3.2.1"
override "libiconv", version: "1.14"