From 86dc72afb6c6a8da3b6fccbab7b2d7226c44d7fa Mon Sep 17 00:00:00 2001 From: tyler-ball Date: Mon, 4 Apr 2016 08:10:20 -0600 Subject: Revert https://github.com/chef/chef/pull/4781 because jmespath was relased with an update to prevent loading issues with json vs json_pure --- omnibus/Gemfile | 4 ---- 1 file changed, 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" -- cgit v1.2.1