summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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 c00eff165a..b25c13ef80 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 13.12.5 -->
-## [v13.12.5](https://github.com/chef/chef/tree/v13.12.5) (2019-01-22)
+<!-- latest_release 13.12.6 -->
+## [v13.12.6](https://github.com/chef/chef/tree/v13.12.6) (2019-01-22)
#### Merged Pull Requests
-- Update Chef 13 to the latest gem deps [#8145](https://github.com/chef/chef/pull/8145) ([tas50](https://github.com/tas50))
+- Update omnibus Chef dep to 14.8 [#8146](https://github.com/chef/chef/pull/8146) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup since=13.12.3 -->
### Changes since 13.12.3 release
#### Merged Pull Requests
+- Update omnibus Chef dep to 14.8 [#8146](https://github.com/chef/chef/pull/8146) ([tas50](https://github.com/tas50)) <!-- 13.12.6 -->
- Update Chef 13 to the latest gem deps [#8145](https://github.com/chef/chef/pull/8145) ([tas50](https://github.com/tas50)) <!-- 13.12.5 -->
- Update openssl to 1.0.2q and bring in latest omnibus-software [#8088](https://github.com/chef/chef/pull/8088) ([tas50](https://github.com/tas50)) <!-- 13.12.4 -->
<!-- release_rollup -->
diff --git a/Gemfile.lock b/Gemfile.lock
index fb776691c1..3804b1f255 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,10 +1,10 @@
PATH
remote: .
specs:
- chef (13.12.5)
+ chef (13.12.6)
addressable
bundler (>= 1.10)
- chef-config (= 13.12.5)
+ chef-config (= 13.12.6)
chef-zero (~> 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -31,10 +31,10 @@ PATH
specinfra (~> 2.10)
syslog-logger (~> 1.6)
uuidtools (~> 2.1.5)
- chef (13.12.5-universal-mingw32)
+ chef (13.12.6-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 13.12.5)
+ chef-config (= 13.12.6)
chef-zero (~> 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -76,7 +76,7 @@ PATH
PATH
remote: chef-config
specs:
- chef-config (13.12.5)
+ chef-config (13.12.6)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 3.0)
diff --git a/VERSION b/VERSION
index 1d35c11a40..1c42729484 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-13.12.5 \ No newline at end of file
+13.12.6 \ 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 49dd33ccc3..140657fdfb 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 = "13.12.5"
+ VERSION = "13.12.6"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index aa565f0492..818f472a47 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("13.12.5")
+ VERSION = Chef::VersionString.new("13.12.6")
end
#