diff options
author | Chef Expeditor <eng-services-ops+chef-ci@chef.io> | 2018-02-22 17:58:54 +0000 |
---|---|---|
committer | Chef Expeditor <eng-services-ops+chef-ci@chef.io> | 2018-02-22 17:58:54 +0000 |
commit | a536a54dfa029c657bcfd25c8d47e20a5983f458 (patch) | |
tree | 28be12493dd60951f7088cc2ec7c34b56eebce47 | |
parent | 841f8e41aea5aae10e9e267fb2fdcde2c82652ef (diff) | |
download | chef-a536a54dfa029c657bcfd25c8d47e20a5983f458.tar.gz |
Bump version to 14.0.74 by Expeditorv14.0.74
-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 29536e3894..c9b5b9896b 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.72 --> -## [v14.0.72](https://github.com/chef/chef/tree/v14.0.72) (2018-02-22) +<!-- latest_release 14.0.74 --> +## [v14.0.74](https://github.com/chef/chef/tree/v14.0.74) (2018-02-22) #### Merged Pull Requests -- Update libxml2 to 2.9.7 [#6885](https://github.com/chef/chef/pull/6885) ([tas50](https://github.com/tas50)) +- Allow tarballs generated by chef export to be used [#6871](https://github.com/chef/chef/pull/6871) ([thommay](https://github.com/thommay)) <!-- latest_release --> <!-- release_rollup since=13.7.16 --> ### Changes since 13.7.16 release #### Merged Pull Requests +- Allow tarballs generated by chef export to be used [#6871](https://github.com/chef/chef/pull/6871) ([thommay](https://github.com/thommay)) <!-- 14.0.74 --> - Update libxml2 to 2.9.7 [#6885](https://github.com/chef/chef/pull/6885) ([tas50](https://github.com/tas50)) <!-- 14.0.72 --> - Disable sudo on unit tests [#6879](https://github.com/chef/chef/pull/6879) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 14.0.71 --> - Add macos_user_defaults resource from mac_os_x cookbook [#6878](https://github.com/chef/chef/pull/6878) ([tas50](https://github.com/tas50)) <!-- 14.0.70 --> diff --git a/Gemfile.lock b/Gemfile.lock index b39d90dedf..10736cf161 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -35,10 +35,10 @@ GIT PATH remote: . specs: - chef (14.0.73) + chef (14.0.74) addressable bundler (>= 1.10) - chef-config (= 14.0.73) + chef-config (= 14.0.74) 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.73-universal-mingw32) + chef (14.0.74-universal-mingw32) addressable bundler (>= 1.10) - chef-config (= 14.0.73) + chef-config (= 14.0.74) 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.73) + chef-config (14.0.74) addressable fuzzyurl mixlib-config (~> 2.0) @@ -1 +1 @@ -14.0.73
\ No newline at end of file +14.0.74
\ 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 4910004fff..39a5a73ae9 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.73" + VERSION = "14.0.74" end # diff --git a/lib/chef/version.rb b/lib/chef/version.rb index 9e6488a8a1..2cc8f903b4 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.73") + VERSION = Chef::VersionString.new("14.0.74") end # |