summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <eng-services-ops+chef-ci@chef.io>2017-10-18 19:38:36 +0000
committerChef Expeditor <eng-services-ops+chef-ci@chef.io>2017-10-18 19:38:36 +0000
commitca8d4f416f0bbfed5b18a16f987ae52fb1de87cc (patch)
tree21b58e86432e7043b3eb5d2b7ca4fb2119812147
parentd68c2244fe5aacc5d9992b4d35e45220713c4032 (diff)
downloadchef-ca8d4f416f0bbfed5b18a16f987ae52fb1de87cc.tar.gz
Bump version to 12.21.21 by Expeditorv12.21.21
-rw-r--r--CHANGELOG.md12
-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, 18 insertions, 10 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 98fbac711f..4e7d93d97c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release -->
+<!-- latest_release 12.21.21 -->
+## [v12.21.21](https://github.com/chef/chef/tree/v12.21.21) (2017-10-18)
+
+#### Merged Pull Requests
+- Don&#39;t use the safe navigation operator which requires Ruby 2.3 [#6508](https://github.com/chef/chef/pull/6508) ([tas50](https://github.com/tas50))
<!-- latest_release -->
-<!-- release_rollup -->
+<!-- release_rollup since=13.5.3 -->
+### Changes since 13.5.3 release
+
+#### Merged Pull Requests
+- Don&#39;t use the safe navigation operator which requires Ruby 2.3 [#6508](https://github.com/chef/chef/pull/6508) ([tas50](https://github.com/tas50)) <!-- 12.21.21 -->
<!-- release_rollup -->
<!-- latest_stable_release -->
diff --git a/Gemfile.lock b/Gemfile.lock
index f3e66c10ef..9e40b2a323 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -38,10 +38,10 @@ GIT
PATH
remote: .
specs:
- chef (12.21.20)
+ chef (12.21.21)
addressable
bundler (>= 1.10)
- chef-config (= 12.21.20)
+ chef-config (= 12.21.21)
chef-zero (>= 4.8, < 13)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -67,10 +67,10 @@ PATH
specinfra (~> 2.10)
syslog-logger (~> 1.6)
uuidtools (~> 2.1.5)
- chef (12.21.20-universal-mingw32)
+ chef (12.21.21-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 12.21.20)
+ chef-config (= 12.21.21)
chef-zero (>= 4.8, < 13)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -111,7 +111,7 @@ PATH
PATH
remote: chef-config
specs:
- chef-config (12.21.20)
+ chef-config (12.21.21)
addressable
fuzzyurl
mixlib-config (~> 2.0)
diff --git a/VERSION b/VERSION
index 4c9b2f4701..ef813270ee 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-12.21.20 \ No newline at end of file
+12.21.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 293e13e2eb..797c0604e7 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 = "12.21.20"
+ VERSION = "12.21.21"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 0244a5dd9a..be9e78bd6e 100644
--- a/lib/chef/version.rb
+++ b/lib/chef/version.rb
@@ -21,7 +21,7 @@
class Chef
CHEF_ROOT = File.expand_path("../..", __FILE__)
- VERSION = "12.21.20"
+ VERSION = "12.21.21"
end
#