summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-08-10 16:29:28 +0000
committerChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-08-10 16:29:28 +0000
commit1cc286d839129950dea85d3f25b960e8fb470f4f (patch)
tree9d51f6446d294854478a671bdf33811057dc6f6b
parentc47eb3bd3983f1e743cc9178765c2d4c60becb2a (diff)
downloadchef-14.4.29.tar.gz
Bump version to 14.4.29 by Chef Expeditorv14.4.29
-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 f06edc456c..0748d47c8d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 14.4.28 -->
-## [v14.4.28](https://github.com/chef/chef/tree/v14.4.28) (2018-08-10)
+<!-- latest_release 14.4.29 -->
+## [v14.4.29](https://github.com/chef/chef/tree/v14.4.29) (2018-08-10)
#### Merged Pull Requests
-- Update omnibus to 5.6.15 [#7536](https://github.com/chef/chef/pull/7536) ([tas50](https://github.com/tas50))
+- Update inspec to 2.2.61 [#7534](https://github.com/chef/chef/pull/7534) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup since=14.3.37 -->
### Changes since 14.3.37 release
#### Merged Pull Requests
+- Update inspec to 2.2.61 [#7534](https://github.com/chef/chef/pull/7534) ([tas50](https://github.com/tas50)) <!-- 14.4.29 -->
- Update omnibus to 5.6.15 [#7536](https://github.com/chef/chef/pull/7536) ([tas50](https://github.com/tas50)) <!-- 14.4.28 -->
- Bump Ohai to 14.4 [#7532](https://github.com/chef/chef/pull/7532) ([tas50](https://github.com/tas50)) <!-- 14.4.27 -->
- stop parsing init script at the &quot;### END INIT INFO&quot; marker. [#7525](https://github.com/chef/chef/pull/7525) ([goblin23](https://github.com/goblin23)) <!-- 14.4.26 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index fb8cb9393e..8036a0c90c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -9,10 +9,10 @@ GIT
PATH
remote: .
specs:
- chef (14.4.28)
+ chef (14.4.29)
addressable
bundler (>= 1.10)
- chef-config (= 14.4.28)
+ chef-config (= 14.4.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.4.28-universal-mingw32)
+ chef (14.4.29-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 14.4.28)
+ chef-config (= 14.4.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.4.28)
+ chef-config (14.4.29)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 3.0)
diff --git a/VERSION b/VERSION
index 402a4d0bb7..4f4b90a324 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.4.28 \ No newline at end of file
+14.4.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 43bbaf5bf3..37d7223648 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.4.28".freeze
+ VERSION = "14.4.29".freeze
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index f4555742f0..2f0a414990 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.4.28")
+ VERSION = Chef::VersionString.new("14.4.29")
end
#