summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <eng-services-ops+chef-ci@chef.io>2017-08-29 00:28:19 +0000
committerChef Expeditor <eng-services-ops+chef-ci@chef.io>2017-08-29 00:28:19 +0000
commita66c86fc444764cd0f135ad2e1109e50dac616cf (patch)
tree9574611947f4e2a69ac89840207939cc35675b65
parent1d983362796f2163c12931fa9f34b22fa8d81fd9 (diff)
downloadchef-a66c86fc444764cd0f135ad2e1109e50dac616cf.tar.gz
Bump version to 12.21.5 by Chef Expeditorv12.21.5
-rw-r--r--CHANGELOG.md2
-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, 9 insertions, 9 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3a955e270a..a60cd2e2ef 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1407,4 +1407,4 @@ of partial templates.
* Allow specifying a guard_interpreter after a conditional on a resource (Fixes #1943)
* Windows package type should be a symbol (Fixes #1997)
-\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*
+\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)* \ No newline at end of file
diff --git a/Gemfile.lock b/Gemfile.lock
index 7f185c5b2a..acde661948 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -38,10 +38,10 @@ GIT
PATH
remote: .
specs:
- chef (12.21.4)
+ chef (12.21.5)
addressable
bundler (>= 1.10)
- chef-config (= 12.21.4)
+ chef-config (= 12.21.5)
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.4-universal-mingw32)
+ chef (12.21.5-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 12.21.4)
+ chef-config (= 12.21.5)
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.4)
+ chef-config (12.21.5)
addressable
fuzzyurl
mixlib-config (~> 2.0)
diff --git a/VERSION b/VERSION
index 411efa5ea0..2fc0902c08 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-12.21.4 \ No newline at end of file
+12.21.5 \ 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 41475da3a6..afda30d61f 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.4"
+ VERSION = "12.21.5"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index b58522d3a7..384f43c67a 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.4"
+ VERSION = "12.21.5"
end
#