summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-09-21 01:29:37 +0000
committerChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-09-21 01:29:37 +0000
commit859571775d28eb4f2922614abe1114db1a23094e (patch)
treee338621e9c9fa906e827053b9519c9c2dbf34496
parent5dcea94746f627c6c6f04777bc96099209debbd7 (diff)
downloadchef-859571775d28eb4f2922614abe1114db1a23094e.tar.gz
Bump version to 14.5.29 by Chef Expeditorv14.5.29
Obvious fix; these changes are the result of automation not creative thinking.
-rw-r--r--CHANGELOG.md7
-rw-r--r--Gemfile.lock12
-rw-r--r--VERSION2
-rw-r--r--chef-config/lib/chef-config/version.rb2
-rw-r--r--lib/chef/version.rb2
5 files changed, 13 insertions, 12 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index eed7ec5611..f36b5cf879 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.28 -->
-## [v14.5.28](https://github.com/chef/chef/tree/v14.5.28) (2018-09-18)
+<!-- latest_release 14.5.29 -->
+## [v14.5.29](https://github.com/chef/chef/tree/v14.5.29) (2018-09-21)
#### Merged Pull Requests
-- windows_service: Remove potentially sensitive info from the log [#7659](https://github.com/chef/chef/pull/7659) ([stuartpreston](https://github.com/stuartpreston))
+- windows_feature: Fix exception message grammar [#7669](https://github.com/chef/chef/pull/7669) ([dgreeninger](https://github.com/dgreeninger))
<!-- latest_release -->
<!-- release_rollup since=14.5.27 -->
### Changes since 14.5.27 release
#### Merged Pull Requests
+- windows_feature: Fix exception message grammar [#7669](https://github.com/chef/chef/pull/7669) ([dgreeninger](https://github.com/dgreeninger)) <!-- 14.5.29 -->
- windows_service: Remove potentially sensitive info from the log [#7659](https://github.com/chef/chef/pull/7659) ([stuartpreston](https://github.com/stuartpreston)) <!-- 14.5.28 -->
<!-- release_rollup -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 1b7e97dfbb..2dda049046 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -9,10 +9,10 @@ GIT
PATH
remote: .
specs:
- chef (14.5.28)
+ chef (14.5.29)
addressable
bundler (>= 1.10)
- chef-config (= 14.5.28)
+ chef-config (= 14.5.29)
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.28-universal-mingw32)
+ chef (14.5.29-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 14.5.28)
+ chef-config (= 14.5.29)
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.28)
+ chef-config (14.5.29)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 3.0)
@@ -378,4 +378,4 @@ DEPENDENCIES
yard
BUNDLED WITH
- 1.16.4
+ 1.16.5
diff --git a/VERSION b/VERSION
index 6d31393e67..a6f808e712 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.5.28 \ No newline at end of file
+14.5.29 \ 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 5d0588af68..df8bea8f01 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.28".freeze
+ VERSION = "14.5.29".freeze
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 420f5bc53d..526159df89 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.28")
+ VERSION = Chef::VersionString.new("14.5.29")
end
#