From bcd0b5448bacd5e544d1166a29e438d9e9c6336b Mon Sep 17 00:00:00 2001 From: Steven Danna Date: Thu, 19 Nov 2015 11:06:06 +0000 Subject: Point at master of oc-chef-pedant and chef --- Gemfile | 5 ++--- 1 file 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" -- cgit v1.2.1