summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-09-14 17:51:05 +0000
committerChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-09-14 17:51:05 +0000
commita9a04fbb0029b7711404be615c6c1e14bb26f6c2 (patch)
tree7c072a7b6fddf174ac6a14492526bc5797d41470
parent7649aff1d32fe8906b6cce4d6458f241328ca592 (diff)
downloadchef-a9a04fbb0029b7711404be615c6c1e14bb26f6c2.tar.gz
Bump version to 14.5.14 by Chef Expeditorv14.5.14
Obvious fix; these changes are the result of automation not creative thinking.
-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 c874e218b2..86d5044bf3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 14.5.13 -->
-## [v14.5.13](https://github.com/chef/chef/tree/v14.5.13) (2018-09-14)
+<!-- latest_release 14.5.14 -->
+## [v14.5.14](https://github.com/chef/chef/tree/v14.5.14) (2018-09-14)
#### Merged Pull Requests
-- windows_ad_join resource - add newname property [#7637](https://github.com/chef/chef/pull/7637) ([derekgroh](https://github.com/derekgroh))
+- Bump inspec-core to 2.2.101 [#7640](https://github.com/chef/chef/pull/7640) ([chef-ci](https://github.com/chef-ci))
<!-- latest_release -->
<!-- release_rollup since=14.4.56 -->
### Changes since 14.4.56 release
#### Merged Pull Requests
+- Bump inspec-core to 2.2.101 [#7640](https://github.com/chef/chef/pull/7640) ([chef-ci](https://github.com/chef-ci)) <!-- 14.5.14 -->
- windows_ad_join resource - add newname property [#7637](https://github.com/chef/chef/pull/7637) ([derekgroh](https://github.com/derekgroh)) <!-- 14.5.13 -->
- Add locale resource more managing the system&#39;s locale [#7633](https://github.com/chef/chef/pull/7633) ([vincentaubert](https://github.com/vincentaubert)) <!-- 14.5.12 -->
- paludis_package: Make sure timeout property is an Integer [#7625](https://github.com/chef/chef/pull/7625) ([tas50](https://github.com/tas50)) <!-- 14.5.11 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 26b5ac9e7b..498c56f092 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -9,10 +9,10 @@ GIT
PATH
remote: .
specs:
- chef (14.5.13)
+ chef (14.5.14)
addressable
bundler (>= 1.10)
- chef-config (= 14.5.13)
+ chef-config (= 14.5.14)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -40,10 +40,10 @@ PATH
specinfra (~> 2.10)
syslog-logger (~> 1.6)
uuidtools (~> 2.1.5)
- chef (14.5.13-universal-mingw32)
+ chef (14.5.14-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 14.5.13)
+ chef-config (= 14.5.14)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -86,7 +86,7 @@ PATH
PATH
remote: chef-config
specs:
- chef-config (14.5.13)
+ chef-config (14.5.14)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 3.0)
diff --git a/VERSION b/VERSION
index d2d0c9e015..ebfabcd0c9 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.5.13 \ No newline at end of file
+14.5.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 6957f511d5..e1ad17e024 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 = "14.5.13".freeze
+ VERSION = "14.5.14".freeze
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 482d3d85ac..ab3d5acddc 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("14.5.13")
+ VERSION = Chef::VersionString.new("14.5.14")
end
#