diff options
| author | John Keiser <john@johnkeiser.com> | 2015-09-18 10:41:30 -0700 |
|---|---|---|
| committer | John Keiser <john@johnkeiser.com> | 2015-09-18 11:03:00 -0700 |
| commit | 3da8700c1c88a44488732bae47bcc5b1cb545ca2 (patch) | |
| tree | c14ef37228a789b97140a1f9dffb82800a3cdd83 | |
| parent | 246e49bf9c4a55c1984be5dca4ff8b08b1adca87 (diff) | |
| download | chef-3da8700c1c88a44488732bae47bcc5b1cb545ca2.tar.gz | |
Remove dependency on master of ohai and friendsjk/no-more-master
| -rw-r--r-- | pedant.gemfile | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/pedant.gemfile b/pedant.gemfile index 888e6b83f3..3302bccfe1 100644 --- a/pedant.gemfile +++ b/pedant.gemfile @@ -1,14 +1,9 @@ source "https://rubygems.org" gemspec :name => "chef" -gem 'rest-client', :github => 'opscode/rest-client', :branch => 'lcg/1.6.7-version-lying' - # TODO figure out how to grab this stuff from the main Gemfile gem "activesupport", "< 4.0.0", :group => :compat_testing, :platform => "ruby" -gem "mixlib-shellout", github: "opscode/mixlib-shellout", branch: "master" -gem "ohai", github: "opscode/ohai", branch: "master" - # We are pinning chef-zero to 4.2.x until ChefFS can deal # with V1 api calls or chef-zero supports both v0 and v1 gem "chef-zero", "~> 4.2.3" |