diff options
author | Chef Expeditor <eng-services-ops+chef-ci@chef.io> | 2018-02-28 23:02:47 +0000 |
---|---|---|
committer | Chef Expeditor <eng-services-ops+chef-ci@chef.io> | 2018-02-28 23:02:47 +0000 |
commit | 42e6f12b7310897949663af7ff8ffc2b47a74779 (patch) | |
tree | 4eab03a887b882f2569663eade505bcea31b3a19 | |
parent | fd02c58b4aa3bc31398c2f26d0f2a6dfd898ede0 (diff) | |
download | chef-42e6f12b7310897949663af7ff8ffc2b47a74779.tar.gz |
Bump version to 14.0.97 by Expeditorv14.0.97
-rw-r--r-- | CHANGELOG.md | 7 | ||||
-rw-r--r-- | Gemfile.lock | 10 | ||||
-rw-r--r-- | VERSION | 2 | ||||
-rw-r--r-- | chef-config/lib/chef-config/version.rb | 2 | ||||
-rw-r--r-- | lib/chef/version.rb | 2 |
5 files changed, 12 insertions, 11 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 7922b5fe22..e872165406 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,15 +1,16 @@ <!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ --> -<!-- latest_release 14.0.96 --> -## [v14.0.96](https://github.com/chef/chef/tree/v14.0.96) (2018-02-28) +<!-- latest_release 14.0.97 --> +## [v14.0.97](https://github.com/chef/chef/tree/v14.0.97) (2018-02-28) #### Merged Pull Requests -- Revert appbundler to 0.10.0 [#6922](https://github.com/chef/chef/pull/6922) ([lamont-granquist](https://github.com/lamont-granquist)) +- need to pin appbundler in omnibus [#6924](https://github.com/chef/chef/pull/6924) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- latest_release --> <!-- release_rollup since=13.7.16 --> ### Changes since 13.7.16 release #### Merged Pull Requests +- need to pin appbundler in omnibus [#6924](https://github.com/chef/chef/pull/6924) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 14.0.97 --> - Revert appbundler to 0.10.0 [#6922](https://github.com/chef/chef/pull/6922) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 14.0.96 --> - fixing red omnibus builds [#6921](https://github.com/chef/chef/pull/6921) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 14.0.95 --> - fix for master of chefstyle [#6919](https://github.com/chef/chef/pull/6919) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 14.0.93 --> diff --git a/Gemfile.lock b/Gemfile.lock index 48a002c0f0..bc902c8ee6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -35,10 +35,10 @@ GIT PATH remote: . specs: - chef (14.0.96) + chef (14.0.97) addressable bundler (>= 1.10) - chef-config (= 14.0.96) + chef-config (= 14.0.97) chef-zero (>= 13.0) diff-lcs (~> 1.2, >= 1.2.4) erubis (~> 2.7) @@ -65,10 +65,10 @@ PATH specinfra (~> 2.10) syslog-logger (~> 1.6) uuidtools (~> 2.1.5) - chef (14.0.96-universal-mingw32) + chef (14.0.97-universal-mingw32) addressable bundler (>= 1.10) - chef-config (= 14.0.96) + chef-config (= 14.0.97) chef-zero (>= 13.0) diff-lcs (~> 1.2, >= 1.2.4) erubis (~> 2.7) @@ -110,7 +110,7 @@ PATH PATH remote: chef-config specs: - chef-config (14.0.96) + chef-config (14.0.97) addressable fuzzyurl mixlib-config (~> 2.0) @@ -1 +1 @@ -14.0.96
\ No newline at end of file +14.0.97
\ No newline at end of file diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb index 71bd7f4f68..56e35235e6 100644 --- a/chef-config/lib/chef-config/version.rb +++ b/chef-config/lib/chef-config/version.rb @@ -21,7 +21,7 @@ module ChefConfig CHEFCONFIG_ROOT = File.expand_path("../..", __FILE__) - VERSION = "14.0.96" + VERSION = "14.0.97" end # diff --git a/lib/chef/version.rb b/lib/chef/version.rb index 4964f328c5..cfff78fa39 100644 --- a/lib/chef/version.rb +++ b/lib/chef/version.rb @@ -23,7 +23,7 @@ require "chef/version_string" class Chef CHEF_ROOT = File.expand_path("../..", __FILE__) - VERSION = Chef::VersionString.new("14.0.96") + VERSION = Chef::VersionString.new("14.0.97") end # |