summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <eng-services-ops+chef-ci@chef.io>2017-10-27 06:49:00 +0000
committerChef Expeditor <eng-services-ops+chef-ci@chef.io>2017-10-27 06:49:00 +0000
commita7148bb5ab0572d2b5a277848f3bc10f5259042b (patch)
treedf727ce318a3a8f96dbd34e28ac6f2380992c80f
parentbbd3d790f78e812ba48fef443d96799392e9e4c4 (diff)
downloadchef-a7148bb5ab0572d2b5a277848f3bc10f5259042b.tar.gz
Bump version to 12.21.26 by Expeditorv12.21.26
-rw-r--r--CHANGELOG.md7
-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, 11 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8006272592..0eb8c68141 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 12.21.25 -->
-## [v12.21.25](https://github.com/chef/chef/tree/v12.21.25) (2017-10-23)
+<!-- latest_release 12.21.26 -->
+## [v12.21.26](https://github.com/chef/chef/tree/v12.21.26) (2017-10-27)
#### Merged Pull Requests
-- Update ruby version required in readme [#6517](https://github.com/chef/chef/pull/6517) ([tas50](https://github.com/tas50))
+- Update liblzma, libxml2, libxslt, libyaml, zlib, and openssl [#6531](https://github.com/chef/chef/pull/6531) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup since=13.5.3 -->
### Changes since 13.5.3 release
#### Merged Pull Requests
+- Update liblzma, libxml2, libxslt, libyaml, zlib, and openssl [#6531](https://github.com/chef/chef/pull/6531) ([tas50](https://github.com/tas50)) <!-- 12.21.26 -->
- Update ruby version required in readme [#6517](https://github.com/chef/chef/pull/6517) ([tas50](https://github.com/tas50)) <!-- 12.21.25 -->
- Pull in Ohai 8.25 [#6509](https://github.com/chef/chef/pull/6509) ([tas50](https://github.com/tas50)) <!-- 12.21.24 -->
- Use Rubygems 2.6.14 to fix CVE-2017-0903 [#6507](https://github.com/chef/chef/pull/6507) ([tas50](https://github.com/tas50)) <!-- 12.21.23 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index fb2bde1ac5..a19f0bc107 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -38,10 +38,10 @@ GIT
PATH
remote: .
specs:
- chef (12.21.25)
+ chef (12.21.26)
addressable
bundler (>= 1.10)
- chef-config (= 12.21.25)
+ chef-config (= 12.21.26)
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.25-universal-mingw32)
+ chef (12.21.26-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 12.21.25)
+ chef-config (= 12.21.26)
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.25)
+ chef-config (12.21.26)
addressable
fuzzyurl
mixlib-config (~> 2.0)
diff --git a/VERSION b/VERSION
index d5bd70be51..a5f5b71ea4 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-12.21.25 \ No newline at end of file
+12.21.26 \ 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 e6b8e2f883..df9adbf0e8 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.25"
+ VERSION = "12.21.26"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index a744b8a092..0f2ec27eb4 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.25"
+ VERSION = "12.21.26"
end
#