summaryrefslogtreecommitdiff
path: root/Gemfile
diff options
context:
space:
mode:
authorJohn Keiser <john@johnkeiser.com>2016-01-28 10:51:09 -0800
committerJohn Keiser <john@johnkeiser.com>2016-01-28 10:51:09 -0800
commit59d187df7b3acfa99a448fd9374fcd17303bffc8 (patch)
tree263d371284d298c4e50466ec0cc7faca74674ac2 /Gemfile
parent57f2536f25b06930dbbf3560dfc6e2b0c644af03 (diff)
parent80783dac0105c37a857534d91cf38918608c3966 (diff)
downloadchef-zero-59d187df7b3acfa99a448fd9374fcd17303bffc8.tar.gz
Merge pull request #194 from chef/cd/run-acl-specs
Make ACLs for policies/policy_groups/cookbook_artifacts work
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile7
1 files changed, 2 insertions, 5 deletions
diff --git a/Gemfile b/Gemfile
index c0d8cbc..900c416 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,12 +3,9 @@ gemspec
gem 'rest-client', :github => 'chef/rest-client'
-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/authorization-tags"
# 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 => 'jk/policies-acls'