diff options
| author | Bryan McLellan <btm@loftninjas.org> | 2017-07-24 17:21:02 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-24 17:21:02 -0400 |
| commit | 3d6b7c386d524e5fa75b73dc47363ec4690ee351 (patch) | |
| tree | 18d935df5f6f6d97d7ea5a1d455db23728e4b029 | |
| parent | 89d13b94b7de1d4d16304065425c3349d1222148 (diff) | |
| download | chef-3d6b7c386d524e5fa75b73dc47363ec4690ee351.tar.gz | |
Updating / fixing deps to fix acceptance (#6292)
* Remove call to update_omnibus_overrides
The rake tasks `update_omnibus_overrides` was removed in dafd5139338aed684410e311b9be906b346db678.
* Update acceptance/Gemfile.lock to match Gemfile.lock for mixlib-shellout
This should fix acceptance where we're seeing both mixlib-shellout 2.3.1 and 2.3.2.
| -rw-r--r-- | acceptance/Gemfile.lock | 2 | ||||
| -rw-r--r-- | omnibus/Gemfile.lock | 14 | ||||
| -rw-r--r-- | tasks/dependencies.rb | 1 |
3 files changed, 8 insertions, 9 deletions
diff --git a/acceptance/Gemfile.lock b/acceptance/Gemfile.lock index eb139cc225..80db23bc4f 100644 --- a/acceptance/Gemfile.lock +++ b/acceptance/Gemfile.lock @@ -128,7 +128,7 @@ GEM mixlib-shellout mixlib-versioning mixlib-log (1.7.1) - mixlib-shellout (2.2.7) + mixlib-shellout (2.3.2) mixlib-versioning (1.1.0) molinillo (0.5.7) multi_json (1.12.1) diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock index a5b42b4bac..fb36fd59cd 100644 --- a/omnibus/Gemfile.lock +++ b/omnibus/Gemfile.lock @@ -38,13 +38,13 @@ GEM public_suffix (~> 2.0, >= 2.0.2) artifactory (2.8.2) awesome_print (1.8.0) - aws-sdk (2.10.14) - aws-sdk-resources (= 2.10.14) - aws-sdk-core (2.10.14) + aws-sdk (2.10.15) + aws-sdk-resources (= 2.10.15) + aws-sdk-core (2.10.15) aws-sigv4 (~> 1.0) jmespath (~> 1.0) - aws-sdk-resources (2.10.14) - aws-sdk-core (= 2.10.14) + aws-sdk-resources (2.10.15) + aws-sdk-core (= 2.10.15) aws-sigv4 (1.0.1) berkshelf (4.3.5) addressable (~> 2.3, >= 2.3.4) @@ -136,8 +136,8 @@ GEM mixlib-versioning thor mixlib-log (1.7.1) - mixlib-shellout (2.3.1) - mixlib-shellout (2.3.1-universal-mingw32) + mixlib-shellout (2.3.2) + mixlib-shellout (2.3.2-universal-mingw32) win32-process (~> 0.8.2) wmi-lite (~> 1.0) mixlib-versioning (1.1.0) diff --git a/tasks/dependencies.rb b/tasks/dependencies.rb index c94e8b2ab2..1c4ec14911 100644 --- a/tasks/dependencies.rb +++ b/tasks/dependencies.rb @@ -37,7 +37,6 @@ namespace :dependencies do desc "Update all dependencies. dependencies:update to update as little as possible (CI-only)." task :update_ci => %w{ dependencies:update_gemfile_lock - dependencies:update_omnibus_overrides dependencies:update_omnibus_gemfile_lock dependencies:update_acceptance_gemfile_lock dependencies:update_kitchen_tests_gemfile_lock |