diff options
| author | Tyler Ball <tyler-ball@users.noreply.github.com> | 2016-04-04 14:17:49 -0600 |
|---|---|---|
| committer | Tyler Ball <tyler-ball@users.noreply.github.com> | 2016-04-04 14:17:49 -0600 |
| commit | 09babe02ff17aa50c7472d5348d049b04227a2fe (patch) | |
| tree | f13ff41de93c3b62d03ef968a742afe927e5018a | |
| parent | b99c65f2e159923dc13786b3677c329cdfc3628a (diff) | |
| parent | 86dc72afb6c6a8da3b6fccbab7b2d7226c44d7fa (diff) | |
| download | chef-09babe02ff17aa50c7472d5348d049b04227a2fe.tar.gz | |
Merge pull request #4790 from chef/revert_pins
Revert https://github.com/chef/chef/pull/4781 because jmespath was relased with an update to prevent loading issues with json vs json_pure
| -rw-r--r-- | omnibus/Gemfile | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/omnibus/Gemfile b/omnibus/Gemfile index fe80adc411..0b076825fc 100644 --- a/omnibus/Gemfile +++ b/omnibus/Gemfile @@ -3,10 +3,6 @@ source "https://rubygems.org" gem "omnibus", git: "https://github.com/chef/omnibus.git" gem "omnibus-software", git: "https://github.com/chef/omnibus-software.git" -# omnibus pulls in aws-sdk which pulls in aws-sdk-core which pulls in jmespath which pulls in json_pure -# json_pure breaks us. jmespath added it in 1.2.2. Pin to 1.1. -gem "jmespath", "< 1.2" - # pedump pessimistically pins multipart-post to a version from 2013 which makes # bundler very unhappy. Remove this when upstream has merged zed-0xff/pedump#6 . gem "pedump", git: "https://github.com/ksubrama/pedump.git", branch: "patch-1" |