summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteven Danna <steve@chef.io>2015-11-19 11:06:06 +0000
committerSteven Danna <steve@chef.io>2015-11-19 11:06:06 +0000
commitbcd0b5448bacd5e544d1166a29e438d9e9c6336b (patch)
treecc57d6e818851981c76f932568a3cb7e3edff4bd
parent66a963e2d6d0865a75f7b65e26338aba6f5e52be (diff)
downloadchef-zero-ssd/fix-gemspec.tar.gz
Point at master of oc-chef-pedant and chefssd/fix-gemspec
-rw-r--r--Gemfile5
1 files changed, 2 insertions, 3 deletions
diff --git a/Gemfile b/Gemfile
index 10835bd..c0d8cbc 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,13 +3,12 @@ gemspec
gem 'rest-client', :github => 'chef/rest-client'
-# we were using e9bf7fe4440afd34856401831b30636100be958b, but now float on latest release.
-gem 'oc-chef-pedant', :github => 'chef/chef-server', :branch => 'jk/multiuser_tag'
+gem 'oc-chef-pedant', :github => 'chef/chef-server'
# gem 'oc-chef-pedant', :path => "../chef-server"
# bundler resolve failure on "rspec_junit_formatter"
# gem 'chef-pedant', :github => 'opscode/chef-pedant', :ref => "server-cli-option"
-gem 'chef', :github => 'chef/chef', :branch => 'invitations-and-members'
+gem 'chef', :github => 'chef/chef'
# gem 'chef', :path => "../chef"