diff options
| author | Lamont Granquist <lamont@scriptkiddie.org> | 2016-09-21 15:59:40 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-21 15:59:40 -0700 |
| commit | 7aaabb4a10c12ce9e9f6d02743cb84a48d02fd2c (patch) | |
| tree | 9082f506842552a4c0b29db179f1c0e4ec522165 | |
| parent | 9965f280523f0cf467906615dc90d416a3621a57 (diff) | |
| parent | 661d25f3df72e82180e19c1918484caac84290d2 (diff) | |
| download | chef-7aaabb4a10c12ce9e9f6d02743cb84a48d02fd2c.tar.gz | |
Merge pull request #5365 from chef/lcg/bump-deps2
update deps, pull in chefspec
| -rw-r--r-- | Gemfile.lock | 6 | ||||
| -rw-r--r-- | acceptance/Gemfile.lock | 2 | ||||
| -rw-r--r-- | kitchen-tests/Gemfile.lock | 2 | ||||
| -rw-r--r-- | omnibus/Gemfile.lock | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 1f70e03af9..03fc74ccf3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,6 +1,6 @@ GIT remote: https://github.com/chef/chef-server - revision: 608dbe94d15822a31849952e13549744fc40a702 + revision: ba0ec88f6800215c574d1d41c4b8bcc86d6f25b0 specs: oc-chef-pedant (2.2.0) activesupport (>= 4.2.7.1, < 6.0) @@ -200,7 +200,7 @@ GEM cheffish (4.0.0) chef-zero (~> 5.0) net-ssh - chefspec (5.1.1) + chefspec (5.2.0) chef (>= 12.0) fauxhai (~> 3.6) rspec (~> 3.0) @@ -480,7 +480,7 @@ GEM simplecov-html (~> 0.10.0) simplecov-html (0.10.0) slop (3.6.0) - specinfra (2.63.0) + specinfra (2.63.1) net-scp net-ssh (>= 2.7, < 4.0) net-telnet diff --git a/acceptance/Gemfile.lock b/acceptance/Gemfile.lock index 6f8ec14a49..8ec07d1c80 100644 --- a/acceptance/Gemfile.lock +++ b/acceptance/Gemfile.lock @@ -198,7 +198,7 @@ GEM thor (0.19.1) timers (4.0.4) hitimes - train (0.19.1) + train (0.20.0) 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 d599890f10..da74e2c35e 100644 --- a/kitchen-tests/Gemfile.lock +++ b/kitchen-tests/Gemfile.lock @@ -197,7 +197,7 @@ GEM thor (0.19.1) timers (4.0.4) hitimes - train (0.19.1) + train (0.20.0) docker-api (~> 1.26) json (>= 1.8, < 3.0) mixlib-shellout (~> 2.0) diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock index f7ce286b70..6e4c00897c 100644 --- a/omnibus/Gemfile.lock +++ b/omnibus/Gemfile.lock @@ -1,6 +1,6 @@ GIT remote: git://github.com/chef/license_scout.git - revision: 37e75fd9372a5c69280258ef9d6c00ac27625c1e + revision: 81f1e5c0afc76bd86132464c8ad2b94d884a4845 specs: license_scout (0.1.2) ffi-yajl (~> 2.2) |