From e7bba87c9f3b4cb8b02846b34da05b6d25169ff4 Mon Sep 17 00:00:00 2001
From: John Keiser <john@johnkeiser.com>
Date: Tue, 23 Aug 2016 15:11:23 -0700
Subject: Bump version to 5.0

---
 CHANGELOG.md             | 12 ++++++++++--
 Gemfile                  |  2 +-
 chef-zero.gemspec        |  3 +--
 lib/chef_zero/version.rb |  2 +-
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4f0bbee..adf582b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,15 @@
 # Change Log
 
-## [4.9.0](https://github.com/chef/chef-zero/tree/4.9.0) (2016-08-11)
-[Full Changelog](https://github.com/chef/chef-zero/compare/v4.8.0...4.9.0)
+## [5.0.0](https://github.com/chef/chef-zero/tree/5.0.0) (2016-08-24)
+[Full Changelog](https://github.com/chef/chef-zero/compare/v4.9.0...5.0.0)
+
+**Implemented enhancements:**
+
+- Support clients and users fields in ACL PUT requests [\#239](https://github.com/chef/chef-zero/pull/239) ([marcparadise](https://github.com/marcparadise))
+- Remove support for Ruby 2.1 [\#237](https://github.com/chef/chef-zero/pull/237) ([jkeiser](https://github.com/jkeiser))
+
+## [v4.9.0](https://github.com/chef/chef-zero/tree/v4.9.0) (2016-08-11)
+[Full Changelog](https://github.com/chef/chef-zero/compare/v4.8.0...v4.9.0)
 
 **Fixed bugs:**
 
diff --git a/Gemfile b/Gemfile
index ac72665..9e2d501 100644
--- a/Gemfile
+++ b/Gemfile
@@ -16,7 +16,7 @@ end
 # bundler resolve failure on "rspec_junit_formatter"
 # gem 'chef-pedant', :github => 'opscode/chef-pedant', :ref => "server-cli-option"
 
-# gem 'chef', :github => 'chef/chef', :branch => 'jk/policies-acls'
+gem "chef", github: "chef/chef" # until chef 12.15 is released
 
 if ENV["GEMFILE_MOD"]
   puts "GEMFILE_MOD: #{ENV['GEMFILE_MOD']}"
diff --git a/chef-zero.gemspec b/chef-zero.gemspec
index fcdb8e9..2a59f30 100644
--- a/chef-zero.gemspec
+++ b/chef-zero.gemspec
@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
   s.homepage = "http://www.chef.io"
   s.license = "Apache 2.0"
 
-  s.required_ruby_version = ">= 2.2.0"
+  s.required_ruby_version = ">= 2.2.2"
 
   s.add_dependency "mixlib-log", "~> 1.3"
   s.add_dependency "hashie", ">= 2.0", "< 4.0"
@@ -25,7 +25,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency "pry-stack_explorer"
   s.add_development_dependency "rake"
   s.add_development_dependency "rspec"
-  s.add_development_dependency "chef"
 
   s.bindir       = "bin"
   s.executables  = ["chef-zero"]
diff --git a/lib/chef_zero/version.rb b/lib/chef_zero/version.rb
index f91c989..d66a928 100644
--- a/lib/chef_zero/version.rb
+++ b/lib/chef_zero/version.rb
@@ -1,3 +1,3 @@
 module ChefZero
-  VERSION = "4.9.1"
+  VERSION = "5.0.0"
 end
-- 
cgit v1.2.1


From 93520a8e4c14e13af404216c5d9c4fea1c756883 Mon Sep 17 00:00:00 2001
From: John Keiser <john@johnkeiser.com>
Date: Tue, 23 Aug 2016 15:24:38 -0700
Subject: Remove redundant master chef tests from Travis

---
 .travis.yml | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a179d82..415a0e3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,14 +24,15 @@ matrix:
       env: SINGLE_ORG=true
     - rvm: 2.3.1
       env: CHEF_FS=true
-    - rvm: 2.2.5
-      env:
-        - CHEF_FS=true
-        - "GEMFILE_MOD=\"gem 'chef', github: 'chef/chef'\""
-    - rvm: 2.3.1
-      env:
-        - CHEF_FS=true
-        - "GEMFILE_MOD=\"gem 'chef', github: 'chef/chef'\""
+# Commented out until we work with a released version again
+#    - rvm: 2.2.5
+#      env:
+#        - CHEF_FS=true
+#        - "GEMFILE_MOD=\"gem 'chef', github: 'chef/chef'\""
+#    - rvm: 2.3.1
+#      env:
+#        - CHEF_FS=true
+#        - "GEMFILE_MOD=\"gem 'chef', github: 'chef/chef'\""
     - rvm: 2.3.1
       env: FILE_STORE=true
     - rvm: 2.3.1
-- 
cgit v1.2.1


From 4005bfd1f10dfa552d13c060a2e86a6da50eae91 Mon Sep 17 00:00:00 2001
From: John Keiser <john@johnkeiser.com>
Date: Tue, 23 Aug 2016 15:31:01 -0700
Subject: Bump rack to 2.x

---
 chef-zero.gemspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/chef-zero.gemspec b/chef-zero.gemspec
index 2a59f30..5152af2 100644
--- a/chef-zero.gemspec
+++ b/chef-zero.gemspec
@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   s.add_dependency "hashie", ">= 2.0", "< 4.0"
   s.add_dependency "uuidtools", "~> 2.1"
   s.add_dependency "ffi-yajl", "~> 2.2"
-  s.add_dependency "rack", "< 2" # 2.0 requires Ruby 2.2+
+  s.add_dependency "rack", "~> 2.0"
 
   s.add_development_dependency "pry"
   s.add_development_dependency "pry-byebug"
-- 
cgit v1.2.1