diff options
| author | Lamont Granquist <lamont@scriptkiddie.org> | 2014-07-23 12:10:39 -0700 |
|---|---|---|
| committer | Lamont Granquist <lamont@scriptkiddie.org> | 2014-07-23 14:21:32 -0700 |
| commit | 09912f51e835f65a40b0e8b3011342f0c1616680 (patch) | |
| tree | f73f1c11f9efbc76e1d57327ecc03976f754797a /pedant.gemfile | |
| parent | c76575510575fb00280e2ee1b8442fe60c4a98a7 (diff) | |
| download | chef-09912f51e835f65a40b0e8b3011342f0c1616680.tar.gz | |
pull in chef-pedant rest-client dep fix
Conflicts:
pedant.gemfile
Diffstat (limited to 'pedant.gemfile')
| -rw-r--r-- | pedant.gemfile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pedant.gemfile b/pedant.gemfile index 8f223defde..2ce3ed27fb 100644 --- a/pedant.gemfile +++ b/pedant.gemfile @@ -1,8 +1,8 @@ source "https://rubygems.org" gemspec :name => "chef" -gem 'rest-client', :github => 'opscode/rest-client' -gem 'chef-pedant', :github => 'opscode/chef-pedant', :ref => '4744d7f318b629ff60a0d22cf02296df36936397' +gem 'rest-client', :github => 'opscode/rest-client', :branch => 'lcg/1.6.7-version-lying' +gem 'chef-pedant', :github => 'opscode/chef-pedant', :ref => 'd12864964a18994b467908daa91811eee1f1bf68' # TODO figure out how to grab this stuff from the main Gemfile gem "activesupport", "< 4.0.0", :group => :compat_testing, :platform => "ruby" |