summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Keiser <john@johnkeiser.com>2016-08-23 12:39:52 -0700
committerJohn Keiser <john@johnkeiser.com>2016-08-24 10:50:14 -0700
commit8492392142efeace0a7b995889243f2b801f51cf (patch)
tree281e0e267a1100fe6d2c3f3d9df24e5b81334457
parent834ef1b18ac88c1c848ee768a0a770eeb793f7b7 (diff)
downloadchef-8492392142efeace0a7b995889243f2b801f51cf.tar.gz
Update all the things
-rw-r--r--Gemfile.lock4
-rw-r--r--acceptance/Gemfile.lock20
-rw-r--r--kitchen-tests/Berksfile.lock11
-rw-r--r--kitchen-tests/Gemfile.lock32
-rw-r--r--omnibus/Gemfile.lock25
-rw-r--r--version_policy.rb2
6 files changed, 52 insertions, 42 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 0445a74f8c..0fd39594c8 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -251,8 +251,8 @@ GEM
mixlib-shellout
mixlib-versioning
mixlib-log (1.7.1)
- mixlib-shellout (2.2.6)
- mixlib-shellout (2.2.6-universal-mingw32)
+ mixlib-shellout (2.2.7)
+ mixlib-shellout (2.2.7-universal-mingw32)
win32-process (~> 0.8.2)
wmi-lite (~> 1.0)
mixlib-versioning (1.1.0)
diff --git a/acceptance/Gemfile.lock b/acceptance/Gemfile.lock
index f4ee7d055a..b42bbb363e 100644
--- a/acceptance/Gemfile.lock
+++ b/acceptance/Gemfile.lock
@@ -53,7 +53,7 @@ GIT
GIT
remote: git://github.com/winrb/winrm-fs.git
- revision: d8fa7d648d797c434b20d8f45aa91ddb8f2d2c82
+ revision: 9e1131a3728054ade541fd6e99ebf7558fdabeb5
branch: winrm-v2
specs:
winrm-fs (1.0.0)
@@ -82,12 +82,12 @@ GEM
specs:
addressable (2.4.0)
artifactory (2.3.3)
- aws-sdk (2.5.3)
- aws-sdk-resources (= 2.5.3)
- aws-sdk-core (2.5.3)
+ aws-sdk (2.5.5)
+ aws-sdk-resources (= 2.5.5)
+ aws-sdk-core (2.5.5)
jmespath (~> 1.0)
- aws-sdk-resources (2.5.3)
- aws-sdk-core (= 2.5.3)
+ aws-sdk-resources (2.5.5)
+ aws-sdk-core (= 2.5.5)
berkshelf (4.3.5)
addressable (~> 2.3, >= 2.3.4)
berkshelf-api-client (~> 2.0, >= 2.0.2)
@@ -124,7 +124,7 @@ GEM
celluloid-io (0.16.2)
celluloid (>= 0.16.0)
nio4r (>= 1.1.0)
- chef-config (12.13.30)
+ chef-config (12.13.37)
fuzzyurl
mixlib-config (~> 2.0)
mixlib-shellout (~> 2.0)
@@ -135,7 +135,7 @@ GEM
excon (>= 0.38.0)
json
erubis (2.7.0)
- excon (0.51.0)
+ excon (0.52.0)
faraday (0.9.2)
multipart-post (>= 1.2, < 3)
ffi (1.9.14)
@@ -178,13 +178,13 @@ GEM
mixlib-log
mixlib-authentication (1.4.1)
mixlib-log
- mixlib-config (2.2.1)
+ mixlib-config (2.2.2)
mixlib-install (1.1.0)
artifactory
mixlib-shellout
mixlib-versioning
mixlib-log (1.7.1)
- mixlib-shellout (2.2.6)
+ mixlib-shellout (2.2.7)
mixlib-versioning (1.1.0)
molinillo (0.4.5)
multi_json (1.12.1)
diff --git a/kitchen-tests/Berksfile.lock b/kitchen-tests/Berksfile.lock
index 767867c321..50643c0d50 100644
--- a/kitchen-tests/Berksfile.lock
+++ b/kitchen-tests/Berksfile.lock
@@ -10,7 +10,7 @@ DEPENDENCIES
GRAPH
apache2 (3.2.2)
- apt (4.0.1)
+ apt (4.0.2)
compat_resource (>= 12.10)
aws (3.4.1)
ohai (>= 2.1.0)
@@ -29,7 +29,8 @@ GRAPH
sudo (>= 0.0.0)
ubuntu (>= 0.0.0)
users (>= 0.0.0)
- build-essential (6.0.3)
+ yum-epel (>= 0.0.0)
+ build-essential (6.0.4)
compat_resource (>= 12.10)
mingw (>= 1.1)
seven_zip (>= 0.0.0)
@@ -90,7 +91,7 @@ GRAPH
seven_zip (2.0.1)
windows (>= 1.2.2)
sudo (2.11.0)
- ubuntu (1.2.0)
+ ubuntu (1.2.1)
apt (>= 0.0.0)
users (3.0.0)
webapp (0.1.0)
@@ -98,14 +99,14 @@ GRAPH
database (~> 2.3.1)
mysql (~> 5.6.3)
php (~> 1.5.0)
- windows (1.44.1)
+ windows (1.44.3)
chef_handler (>= 0.0.0)
xfs (2.0.1)
xml (2.0.0)
build-essential (>= 0.0.0)
chef-sugar (>= 0.0.0)
yum (3.11.0)
- yum-epel (0.7.0)
+ yum-epel (0.7.1)
yum (>= 3.6.3)
yum-mysql-community (0.3.0)
yum (>= 3.2)
diff --git a/kitchen-tests/Gemfile.lock b/kitchen-tests/Gemfile.lock
index ae06da2504..172bd9e418 100644
--- a/kitchen-tests/Gemfile.lock
+++ b/kitchen-tests/Gemfile.lock
@@ -3,12 +3,12 @@ GEM
specs:
addressable (2.4.0)
artifactory (2.3.3)
- aws-sdk (2.5.3)
- aws-sdk-resources (= 2.5.3)
- aws-sdk-core (2.5.3)
+ aws-sdk (2.5.5)
+ aws-sdk-resources (= 2.5.5)
+ aws-sdk-core (2.5.5)
jmespath (~> 1.0)
- aws-sdk-resources (2.5.3)
- aws-sdk-core (= 2.5.3)
+ aws-sdk-resources (2.5.5)
+ aws-sdk-core (= 2.5.5)
berkshelf (4.3.5)
addressable (~> 2.3, >= 2.3.4)
berkshelf-api-client (~> 2.0, >= 2.0.2)
@@ -45,7 +45,7 @@ GEM
celluloid-io (0.16.2)
celluloid (>= 0.16.0)
nio4r (>= 1.1.0)
- chef-config (12.13.30)
+ chef-config (12.13.37)
fuzzyurl
mixlib-config (~> 2.0)
mixlib-shellout (~> 2.0)
@@ -56,7 +56,7 @@ GEM
excon (>= 0.38.0)
json
erubis (2.7.0)
- excon (0.51.0)
+ excon (0.52.0)
faraday (0.9.2)
multipart-post (>= 1.2, < 3)
ffi (1.9.14)
@@ -70,15 +70,17 @@ GEM
hitimes (1.2.4)
hitimes (1.2.4-x86-mingw32)
httpclient (2.7.2)
- inspec (0.29.0)
+ inspec (0.31.0)
hashie (~> 3.4)
json (~> 1.8)
method_source (~> 0.8)
+ molinillo (~> 0)
pry (~> 0)
rainbow (~> 2)
rspec (~> 3)
rspec-its (~> 1.2)
rubyzip (~> 1.1)
+ sslshake (~> 1)
thor (~> 0.19)
train (>= 0.16.0, < 1.0)
jmespath (1.3.1)
@@ -108,14 +110,14 @@ GEM
mixlib-log
mixlib-authentication (1.4.1)
mixlib-log
- mixlib-config (2.2.1)
+ mixlib-config (2.2.2)
mixlib-install (1.1.0)
artifactory
mixlib-shellout
mixlib-versioning
mixlib-log (1.7.1)
- mixlib-shellout (2.2.6)
- mixlib-shellout (2.2.6-universal-mingw32)
+ mixlib-shellout (2.2.7)
+ mixlib-shellout (2.2.7-universal-mingw32)
win32-process (~> 0.8.2)
wmi-lite (~> 1.0)
mixlib-versioning (1.1.0)
@@ -125,6 +127,8 @@ GEM
net-scp (1.2.1)
net-ssh (>= 2.6.5)
net-ssh (3.2.0)
+ net-ssh-gateway (1.2.0)
+ net-ssh (>= 2.6.5)
nio4r (1.2.1)
nori (2.6.0)
octokit (4.3.0)
@@ -180,17 +184,19 @@ GEM
solve (2.0.3)
molinillo (~> 0.4.2)
semverse (~> 1.1)
- test-kitchen (1.10.2)
+ sslshake (1.0.12)
+ test-kitchen (1.11.1)
mixlib-install (~> 1.0, >= 1.0.4)
mixlib-shellout (>= 1.2, < 3.0)
net-scp (~> 1.1)
net-ssh (>= 2.9, < 4.0)
+ net-ssh-gateway (~> 1.2.0)
safe_yaml (~> 1.0)
thor (~> 0.18)
thor (0.19.1)
timers (4.0.4)
hitimes
- train (0.16.0)
+ train (0.17.0)
docker-api (~> 1.26)
json (~> 1.8)
mixlib-shellout (~> 2.0)
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index e3d0f24ead..0912895e80 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -1,6 +1,6 @@
GIT
remote: git://github.com/chef/license_scout.git
- revision: 3f33a3cb48cf4a796b2017a8fb25cf1cb22bf3ab
+ revision: bd8e0da834e45c51e3957598d8a9238ca19187d5
specs:
license_scout (0.1.0)
ffi-yajl (~> 2.2)
@@ -50,12 +50,12 @@ GEM
addressable (2.4.0)
artifactory (2.3.3)
awesome_print (1.7.0)
- aws-sdk (2.5.4)
- aws-sdk-resources (= 2.5.4)
- aws-sdk-core (2.5.4)
+ aws-sdk (2.5.5)
+ aws-sdk-resources (= 2.5.5)
+ aws-sdk-core (2.5.5)
jmespath (~> 1.0)
- aws-sdk-resources (2.5.4)
- aws-sdk-core (= 2.5.4)
+ aws-sdk-resources (2.5.5)
+ aws-sdk-core (= 2.5.5)
berkshelf (4.3.5)
addressable (~> 2.3, >= 2.3.4)
berkshelf-api-client (~> 2.0, >= 2.0.2)
@@ -95,7 +95,7 @@ GEM
celluloid-io (0.16.2)
celluloid (>= 0.16.0)
nio4r (>= 1.1.0)
- chef-config (12.13.30)
+ chef-config (12.13.37)
fuzzyurl
mixlib-config (~> 2.0)
mixlib-shellout (~> 2.0)
@@ -137,14 +137,14 @@ GEM
mixlib-authentication (1.4.1)
mixlib-log
mixlib-cli (1.7.0)
- mixlib-config (2.2.1)
+ mixlib-config (2.2.2)
mixlib-install (1.1.0)
artifactory
mixlib-shellout
mixlib-versioning
mixlib-log (1.7.1)
- mixlib-shellout (2.2.6)
- mixlib-shellout (2.2.6-universal-mingw32)
+ mixlib-shellout (2.2.7)
+ mixlib-shellout (2.2.7-universal-mingw32)
win32-process (~> 0.8.2)
wmi-lite (~> 1.0)
mixlib-versioning (1.1.0)
@@ -154,6 +154,8 @@ GEM
net-scp (1.2.1)
net-ssh (>= 2.6.5)
net-ssh (3.2.0)
+ net-ssh-gateway (1.2.0)
+ net-ssh (>= 2.6.5)
nio4r (1.2.1)
nori (2.6.0)
octokit (4.3.0)
@@ -214,11 +216,12 @@ GEM
molinillo (~> 0.4.2)
semverse (~> 1.1)
systemu (2.6.5)
- test-kitchen (1.10.2)
+ test-kitchen (1.11.1)
mixlib-install (~> 1.0, >= 1.0.4)
mixlib-shellout (>= 1.2, < 3.0)
net-scp (~> 1.1)
net-ssh (>= 2.9, < 4.0)
+ net-ssh-gateway (~> 1.2.0)
safe_yaml (~> 1.0)
thor (~> 0.18)
thor (0.19.1)
diff --git a/version_policy.rb b/version_policy.rb
index e7b6136719..84e3597701 100644
--- a/version_policy.rb
+++ b/version_policy.rb
@@ -32,7 +32,7 @@ OMNIBUS_OVERRIDES = {
"makedepend" => "1.0.5",
"ncurses" => "5.9",
"pkg-config-lite" => "0.28-1",
- "ruby" => "2.1.9",
+ "ruby" => "2.3.1",
# Leave dev-kit pinned to 4.5 on 32-bit, because 4.7 is 20MB larger and we don't want
# to unnecessarily make the client any fatter. (Since it's different between
# 32 and 64, we have to do it in the project file still.)