summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-01-30 11:07:04 +0000
committerChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-01-30 11:07:04 +0000
commit4baf20262d22f984008e3d7a5ca0afbbbe4c0866 (patch)
treea818f11fe62689a74f3f9bb110d288a5b189f3cf
parenta742ca97e710167fbd237e73492e88616e99daf8 (diff)
downloadchef-12.21.32.tar.gz
Bump version to 12.21.32 by Expeditorv12.21.32
-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 80b4389308..8eee05f93e 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.32 -->
+## [v12.21.32](https://github.com/chef/chef/tree/v12.21.32) (2018-01-30)
+
+#### Merged Pull Requests
+- Update Ohai, omnibus, and Ruby versions [#6783](https://github.com/chef/chef/pull/6783) ([tas50](https://github.com/tas50))
<!-- latest_release -->
-<!-- release_rollup -->
+<!-- release_rollup since=12.21.31 -->
+### Changes since 12.21.31 release
+
+#### Merged Pull Requests
+- Update Ohai, omnibus, and Ruby versions [#6783](https://github.com/chef/chef/pull/6783) ([tas50](https://github.com/tas50)) <!-- 12.21.32 -->
<!-- release_rollup -->
<!-- latest_stable_release -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 6c80090760..ca15623071 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -38,10 +38,10 @@ GIT
PATH
remote: .
specs:
- chef (12.21.31)
+ chef (12.21.32)
addressable
bundler (>= 1.10)
- chef-config (= 12.21.31)
+ chef-config (= 12.21.32)
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.31-universal-mingw32)
+ chef (12.21.32-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 12.21.31)
+ chef-config (= 12.21.32)
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.31)
+ chef-config (12.21.32)
addressable
fuzzyurl
mixlib-config (~> 2.0)
diff --git a/VERSION b/VERSION
index 44b4109bc8..e2dfd272ab 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-12.21.31 \ No newline at end of file
+12.21.32 \ 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 88361dc9bb..d938ef9db6 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.31"
+ VERSION = "12.21.32"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 9fe6563672..b1aa3b1c44 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.31"
+ VERSION = "12.21.32"
end
#