diff options
author | Chef Expeditor <eng-services-ops+chef-ci@chef.io> | 2018-08-30 05:30:59 +0000 |
---|---|---|
committer | Chef Expeditor <eng-services-ops+chef-ci@chef.io> | 2018-08-30 05:30:59 +0000 |
commit | 783d39e049f863e620b9518ca1ddfebdae74831b (patch) | |
tree | 22a8c912b6138096b3038cc6d512bad928fefac0 | |
parent | 52bd1598af660d73457a17977fdbf028281fdef5 (diff) | |
download | chef-783d39e049f863e620b9518ca1ddfebdae74831b.tar.gz |
Bump version to 14.4.60 by Chef Expeditorv14.4.60
Obvious fix; these changes are the result of automation not creative thinking.
-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 1c6e6bf91e..af234138e8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,15 +1,16 @@ <!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ --> -<!-- latest_release 14.4.59 --> -## [v14.4.59](https://github.com/chef/chef/tree/v14.4.59) (2018-08-30) +<!-- latest_release 14.4.60 --> +## [v14.4.60](https://github.com/chef/chef/tree/v14.4.60) (2018-08-30) #### Merged Pull Requests -- Simplify the rake task to updating gem dependencies [#7602](https://github.com/chef/chef/pull/7602) ([lamont-granquist](https://github.com/lamont-granquist)) +- Build chef omnibus package with Chef 14 / Berkshelf 7 [#7603](https://github.com/chef/chef/pull/7603) ([tas50](https://github.com/tas50)) <!-- latest_release --> <!-- release_rollup since=14.4.56 --> ### Changes since 14.4.56 release #### Merged Pull Requests +- Build chef omnibus package with Chef 14 / Berkshelf 7 [#7603](https://github.com/chef/chef/pull/7603) ([tas50](https://github.com/tas50)) <!-- 14.4.60 --> - Simplify the rake task to updating gem dependencies [#7602](https://github.com/chef/chef/pull/7602) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 14.4.59 --> - Add additional property docs + update existing docs [#7600](https://github.com/chef/chef/pull/7600) ([tas50](https://github.com/tas50)) <!-- 14.4.58 --> - Bump mixlib-archive to 0.4.16 [#7595](https://github.com/chef/chef/pull/7595) ([chef-ci](https://github.com/chef-ci)) <!-- 14.4.57 --> diff --git a/Gemfile.lock b/Gemfile.lock index 740a873213..03dc788e0d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -9,10 +9,10 @@ GIT PATH remote: . specs: - chef (14.4.59) + chef (14.4.60) addressable bundler (>= 1.10) - chef-config (= 14.4.59) + chef-config (= 14.4.60) chef-zero (>= 13.0) diff-lcs (~> 1.2, >= 1.2.4) erubis (~> 2.7) @@ -40,10 +40,10 @@ PATH specinfra (~> 2.10) syslog-logger (~> 1.6) uuidtools (~> 2.1.5) - chef (14.4.59-universal-mingw32) + chef (14.4.60-universal-mingw32) addressable bundler (>= 1.10) - chef-config (= 14.4.59) + chef-config (= 14.4.60) chef-zero (>= 13.0) diff-lcs (~> 1.2, >= 1.2.4) erubis (~> 2.7) @@ -86,7 +86,7 @@ PATH PATH remote: chef-config specs: - chef-config (14.4.59) + chef-config (14.4.60) addressable fuzzyurl mixlib-config (>= 2.2.12, < 3.0) @@ -1 +1 @@ -14.4.59
\ No newline at end of file +14.4.60
\ 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 36821c7f0e..52af5d6f95 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.4.59".freeze + VERSION = "14.4.60".freeze end # diff --git a/lib/chef/version.rb b/lib/chef/version.rb index 4e87b0059e..53922c7361 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.4.59") + VERSION = Chef::VersionString.new("14.4.60") end # |