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 f01947825b..f8df4951f0 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.13 -->
-## [v13.12.13](https://github.com/chef/chef/tree/v13.12.13) (2019-03-07)
+<!-- latest_release 13.12.14 -->
+## [v13.12.14](https://github.com/chef/chef/tree/v13.12.14) (2019-03-07)
#### Merged Pull Requests
-- Update openssl to 1.0.2r and rubygems to 2.7.9 [#8280](https://github.com/chef/chef/pull/8280) ([tas50](https://github.com/tas50))
+- mount: Add proper new lines when on AIX to prevent failures [#8281](https://github.com/chef/chef/pull/8281) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup since=13.12.3 -->
### Changes since 13.12.3 release
#### Merged Pull Requests
+- mount: Add proper new lines when on AIX to prevent failures [#8281](https://github.com/chef/chef/pull/8281) ([tas50](https://github.com/tas50)) <!-- 13.12.14 -->
- Update openssl to 1.0.2r and rubygems to 2.7.9 [#8280](https://github.com/chef/chef/pull/8280) ([tas50](https://github.com/tas50)) <!-- 13.12.13 -->
- 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 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index f419219a3a..0ea6daa834 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,10 +1,10 @@
PATH
remote: .
specs:
- chef (13.12.13)
+ chef (13.12.14)
addressable
bundler (>= 1.10)
- chef-config (= 13.12.13)
+ chef-config (= 13.12.14)
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.13-universal-mingw32)
+ chef (13.12.14-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 13.12.13)
+ chef-config (= 13.12.14)
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.13)
+ chef-config (13.12.14)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 3.0)
diff --git a/VERSION b/VERSION
index 060cc63993..5a2a99e59a 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-13.12.13 \ No newline at end of file
+13.12.14 \ 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 297c37c935..386ba76c91 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.13"
+ VERSION = "13.12.14"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index ce125fde8b..a5e1edc68d 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.13")
+ VERSION = Chef::VersionString.new("13.12.14")
end
#