summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-06-27 05:53:30 +0000
committerChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-06-27 05:53:30 +0000
commit056ae82723d5448899c816b18642be062920501e (patch)
treea8b5c99dbdf7d479efab5458b95845f9a837d3dd
parent3ba90465dcc0ba3b0f3368d0226a81b69ca72714 (diff)
downloadchef-056ae82723d5448899c816b18642be062920501e.tar.gz
Bump version to 14.3.21 by Chef Expeditorv14.3.21
-rw-r--r--CHANGELOG.md6
-rw-r--r--Gemfile.lock10
-rw-r--r--VERSION2
-rw-r--r--chef-config/lib/chef-config/version.rb2
-rw-r--r--lib/chef/version.rb2
5 files changed, 12 insertions, 10 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1cbcbea344..20ed603e7e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,9 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release unreleased -->
-## Unreleased
+<!-- latest_release 14.3.21 -->
+## [v14.3.21](https://github.com/chef/chef/tree/v14.3.21) (2018-06-27)
#### Merged Pull Requests
+- Add chocolatey_config and chocolatey_source resources [#7388](https://github.com/chef/chef/pull/7388) ([tas50](https://github.com/tas50))
- Add missing knife license headers [#7397](https://github.com/chef/chef/pull/7397) ([tas50](https://github.com/tas50))
<!-- latest_release -->
@@ -10,6 +11,7 @@
### Changes since 14.2.0 release
#### Merged Pull Requests
+- Add chocolatey_config and chocolatey_source resources [#7388](https://github.com/chef/chef/pull/7388) ([tas50](https://github.com/tas50)) <!-- 14.3.21 -->
- Add missing knife license headers [#7397](https://github.com/chef/chef/pull/7397) ([tas50](https://github.com/tas50)) <!-- 14.3.20 -->
- deprecate old shell_out APIs [#7382](https://github.com/chef/chef/pull/7382) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 14.3.20 -->
- Rework the credentials file system to support any config keys. [#7387](https://github.com/chef/chef/pull/7387) ([coderanger](https://github.com/coderanger)) <!-- 14.3.19 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 578dfa649c..b0ca454b80 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -9,10 +9,10 @@ GIT
PATH
remote: .
specs:
- chef (14.3.20)
+ chef (14.3.21)
addressable
bundler (>= 1.10)
- chef-config (= 14.3.20)
+ chef-config (= 14.3.21)
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.3.20-universal-mingw32)
+ chef (14.3.21-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 14.3.20)
+ chef-config (= 14.3.21)
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.3.20)
+ chef-config (14.3.21)
addressable
fuzzyurl
mixlib-config (~> 2.0)
diff --git a/VERSION b/VERSION
index bbfc43ee04..c511829a9d 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.3.20 \ No newline at end of file
+14.3.21 \ 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 aa50742ba8..9868ee79b9 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.3.20"
+ VERSION = "14.3.21"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index e2d52a6526..2118298e46 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.3.20")
+ VERSION = Chef::VersionString.new("14.3.21")
end
#