summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <chef-ci@chef.io>2019-02-28 18:50:50 +0000
committerChef Expeditor <chef-ci@chef.io>2019-02-28 18:50:50 +0000
commit6459960d388a8075d3c7cbc396c31af1456e50be (patch)
treef06f5b0e018d45f99ec6d9b9dcb639358cd5c011
parent56604571cf7cb784b4f164e4903d89de7bd66fd8 (diff)
downloadchef-6459960d388a8075d3c7cbc396c31af1456e50be.tar.gz
Bump version to 13.12.12 by Chef Expeditorv13.12.12
Obvious fix; these changes are the result of automation not creative thinking.
-rw-r--r--CHANGELOG.md7
-rw-r--r--Gemfile.lock14
-rw-r--r--VERSION2
-rw-r--r--chef-config/lib/chef-config/version.rb2
-rw-r--r--lib/chef/version.rb2
5 files changed, 14 insertions, 13 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5528113bca..726b1db3e2 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.11 -->
-## [v13.12.11](https://github.com/chef/chef/tree/v13.12.11) (2019-02-26)
+<!-- latest_release 13.12.12 -->
+## [v13.12.12](https://github.com/chef/chef/tree/v13.12.12) (2019-02-28)
#### Merged Pull Requests
-- Chef-13: add lazy module include to universal DSL [#8247](https://github.com/chef/chef/pull/8247) ([lamont-granquist](https://github.com/lamont-granquist))
+- Update libxml2 to 2.9.9 [#8239](https://github.com/chef/chef/pull/8239) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup since=13.12.3 -->
### Changes since 13.12.3 release
#### Merged Pull Requests
+- Update libxml2 to 2.9.9 [#8239](https://github.com/chef/chef/pull/8239) ([tas50](https://github.com/tas50)) <!-- 13.12.12 -->
- Chef-13: add lazy module include to universal DSL [#8247](https://github.com/chef/chef/pull/8247) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 13.12.11 -->
- Update Ohai to 13.12.6 [#8223](https://github.com/chef/chef/pull/8223) ([tas50](https://github.com/tas50)) <!-- 13.12.10 -->
- Update nokogiri to 1.10.1 [#8218](https://github.com/chef/chef/pull/8218) ([tas50](https://github.com/tas50)) <!-- 13.12.9 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index fe63f68be9..4744c17591 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,10 +1,10 @@
PATH
remote: .
specs:
- chef (13.12.11)
+ chef (13.12.12)
addressable
bundler (>= 1.10)
- chef-config (= 13.12.11)
+ chef-config (= 13.12.12)
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.11-universal-mingw32)
+ chef (13.12.12-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 13.12.11)
+ chef-config (= 13.12.12)
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.11)
+ chef-config (13.12.12)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 3.0)
@@ -180,9 +180,9 @@ GEM
little-plugger (~> 1.1)
multi_json (~> 1.10)
method_source (0.9.2)
- mixlib-archive (0.4.19)
+ mixlib-archive (0.4.20)
mixlib-log
- mixlib-archive (0.4.19-universal-mingw32)
+ mixlib-archive (0.4.20-universal-mingw32)
mixlib-log
mixlib-authentication (1.4.2)
mixlib-cli (1.7.0)
diff --git a/VERSION b/VERSION
index a637262a0b..8214d5e8f7 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-13.12.11 \ No newline at end of file
+13.12.12 \ 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 c239238de7..103a4ed1c2 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.11"
+ VERSION = "13.12.12"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 9e8f94315a..6650d914be 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.11")
+ VERSION = Chef::VersionString.new("13.12.12")
end
#