diff options
author | Chef Expeditor <eng-services-ops+chef-ci@chef.io> | 2018-01-29 14:54:45 +0000 |
---|---|---|
committer | Chef Expeditor <eng-services-ops+chef-ci@chef.io> | 2018-01-29 14:54:45 +0000 |
commit | 96edf6fa02346c666d64041f3af52d54ba4ec9ad (patch) | |
tree | 831b2a68ff8c672dee65484844fffc1f1dc2e8a4 | |
parent | 4b52f6e494807e012f426f0e1db88e1037471718 (diff) | |
download | chef-96edf6fa02346c666d64041f3af52d54ba4ec9ad.tar.gz |
Bump version to 14.0.33 by Expeditorv14.0.33
-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 20aad89d32..ac4dbf4329 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.32 --> -## [v14.0.32](https://github.com/chef/chef/tree/v14.0.32) (2018-01-26) +<!-- latest_release 14.0.33 --> +## [v14.0.33](https://github.com/chef/chef/tree/v14.0.33) (2018-01-29) #### Merged Pull Requests -- Nillable properties are the default now [#6800](https://github.com/chef/chef/pull/6800) ([thommay](https://github.com/thommay)) +- Remove epic_fail alias to ignore_failure [#6801](https://github.com/chef/chef/pull/6801) ([tas50](https://github.com/tas50)) <!-- latest_release --> <!-- release_rollup since=13.7.16 --> ### Changes since 13.7.16 release #### Merged Pull Requests +- Remove epic_fail alias to ignore_failure [#6801](https://github.com/chef/chef/pull/6801) ([tas50](https://github.com/tas50)) <!-- 14.0.33 --> - Nillable properties are the default now [#6800](https://github.com/chef/chef/pull/6800) ([thommay](https://github.com/thommay)) <!-- 14.0.32 --> - Force the creation of a relative link for cacerts [#6798](https://github.com/chef/chef/pull/6798) ([thommay](https://github.com/thommay)) <!-- 14.0.31 --> - use a relative link so that docker does not drop our ca bundle link [#6796](https://github.com/chef/chef/pull/6796) ([thommay](https://github.com/thommay)) <!-- 14.0.30 --> diff --git a/Gemfile.lock b/Gemfile.lock index e2e18515e7..cc937fd959 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -35,10 +35,10 @@ GIT PATH remote: . specs: - chef (14.0.32) + chef (14.0.33) addressable bundler (>= 1.10) - chef-config (= 14.0.32) + chef-config (= 14.0.33) 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.32-universal-mingw32) + chef (14.0.33-universal-mingw32) addressable bundler (>= 1.10) - chef-config (= 14.0.32) + chef-config (= 14.0.33) 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.32) + chef-config (14.0.33) addressable fuzzyurl mixlib-config (~> 2.0) @@ -1 +1 @@ -14.0.32
\ No newline at end of file +14.0.33
\ 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 403eb9169b..272a1c56f9 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.32" + VERSION = "14.0.33" end # diff --git a/lib/chef/version.rb b/lib/chef/version.rb index 7a27f9c20e..3725899a57 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.32") + VERSION = Chef::VersionString.new("14.0.33") end # |