diff options
| author | Lamont Granquist <lamont@scriptkiddie.org> | 2019-03-14 17:04:44 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-14 17:04:44 -0700 |
| commit | 209ef30036960a0a8ba82e5f58bad73935dabefb (patch) | |
| tree | 67699472dd5b24a95299a56dd40da6b987635f32 | |
| parent | f5182468481c8b54884f49ad4ce11ce3b8983da5 (diff) | |
| parent | f9a0f676863ed6a87f0b61beff824ea046e8334e (diff) | |
| download | chef-209ef30036960a0a8ba82e5f58bad73935dabefb.tar.gz | |
Merge pull request #8300 from chef/lcg/fix-unsolvable-gemfile-lock
fix unsolvable Gemfile.lock
| -rw-r--r-- | Gemfile.lock | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 70f3e92398..2b3bdaff45 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -102,8 +102,7 @@ PATH GEM remote: https://rubygems.org/ specs: - addressable (2.5.2) - public_suffix (>= 2.0.2, < 4.0) + addressable (2.4.0) appbundler (0.11.6) mixlib-cli (~> 1.4) mixlib-shellout (~> 2.0) @@ -239,7 +238,6 @@ GEM pry-stack_explorer (0.4.9.3) binding_of_caller (>= 0.7) pry (>= 0.9.11) - public_suffix (3.0.3) pusher-client (0.6.2) json websocket (~> 1.0) @@ -304,7 +302,7 @@ GEM timers (4.3.0) tins (1.20.2) tomlrb (1.2.8) - train-core (1.7.4) + train-core (1.7.5) json (>= 1.8, < 3.0) mixlib-shellout (~> 2.0) travis (1.8.9) |