summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Doherty <cdoherty@chef.io>2015-11-16 11:28:30 -0800
committerChris Doherty <cdoherty@chef.io>2015-11-16 11:28:30 -0800
commit85351c925cc550c209abfa2d590ff3a5f9892db5 (patch)
tree4ff7fe695569dece7c74e94d68f194d0e7883dda
parenteac29ed6cc33acbec509a147a240a9ca1a078cc3 (diff)
downloadchef-zero-85351c925cc550c209abfa2d590ff3a5f9892db5.tar.gz
Point to the relevant oc-chef-pedant and chef/chef branches.
-rw-r--r--Gemfile9
1 files changed, 5 insertions, 4 deletions
diff --git a/Gemfile b/Gemfile
index 46d8928..10835bd 100644
--- a/Gemfile
+++ b/Gemfile
@@ -4,11 +4,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'
-gem 'oc-chef-pedant', :path => "../chef-server"
+gem 'oc-chef-pedant', :github => 'chef/chef-server', :branch => 'jk/multiuser_tag'
+
+# 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'
-gem 'chef', :path => "../chef"
+gem 'chef', :github => 'chef/chef', :branch => 'invitations-and-members'
+# gem 'chef', :path => "../chef"