diff options
| -rw-r--r-- | .travis.yml | 17 | ||||
| -rw-r--r-- | CHANGELOG.md | 12 | ||||
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | chef-zero.gemspec | 5 | ||||
| -rw-r--r-- | lib/chef_zero/version.rb | 2 |
5 files changed, 23 insertions, 15 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 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:** @@ -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..5152af2 100644 --- a/chef-zero.gemspec +++ b/chef-zero.gemspec @@ -12,20 +12,19 @@ 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" 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" 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 |