summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-03-22 17:22:02 +0000
committerChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-03-22 17:22:02 +0000
commitea3a72e0e8b7d81e1118b9562ba2e7948d3a2604 (patch)
tree15ea8a94a99c2b3ce5156287fafbec2a44f4d8df
parent236fc9fb2852256a6825be6b063da5fb2631445c (diff)
downloadchef-ea3a72e0e8b7d81e1118b9562ba2e7948d3a2604.tar.gz
Bump version to 14.0.155 by Expeditorv14.0.155
-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 fe2bf4643e..c75d3ae1f4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 14.0.154 -->
-## [v14.0.154](https://github.com/chef/chef/tree/v14.0.154) (2018-03-22)
+<!-- latest_release 14.0.155 -->
+## [v14.0.155](https://github.com/chef/chef/tree/v14.0.155) (2018-03-22)
#### Merged Pull Requests
-- remove dead code from property declaration [#7025](https://github.com/chef/chef/pull/7025) ([lamont-granquist](https://github.com/lamont-granquist))
+- sudo: Don&#39;t fail on FreeBSD. Turns out there&#39;s a .d directory [#7033](https://github.com/chef/chef/pull/7033) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup since=13.7.16 -->
### Changes since 13.7.16 release
#### Merged Pull Requests
+- sudo: Don&#39;t fail on FreeBSD. Turns out there&#39;s a .d directory [#7033](https://github.com/chef/chef/pull/7033) ([tas50](https://github.com/tas50)) <!-- 14.0.155 -->
- remove dead code from property declaration [#7025](https://github.com/chef/chef/pull/7025) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 14.0.154 -->
- rubocop fixes from engine bump to 0.54.0 [#7023](https://github.com/chef/chef/pull/7023) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 14.0.153 -->
- Save the node&#39;s UUID as an attribute [#7016](https://github.com/chef/chef/pull/7016) ([thommay](https://github.com/thommay)) <!-- 14.0.152 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 8f3f33aeeb..3698bc8634 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -9,10 +9,10 @@ GIT
PATH
remote: .
specs:
- chef (14.0.154)
+ chef (14.0.155)
addressable
bundler (>= 1.10)
- chef-config (= 14.0.154)
+ chef-config (= 14.0.155)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -39,10 +39,10 @@ PATH
specinfra (~> 2.10)
syslog-logger (~> 1.6)
uuidtools (~> 2.1.5)
- chef (14.0.154-universal-mingw32)
+ chef (14.0.155-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 14.0.154)
+ chef-config (= 14.0.155)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -84,7 +84,7 @@ PATH
PATH
remote: chef-config
specs:
- chef-config (14.0.154)
+ chef-config (14.0.155)
addressable
fuzzyurl
mixlib-config (~> 2.0)
@@ -191,7 +191,7 @@ GEM
mixlib-authentication (1.4.2)
mixlib-cli (1.7.0)
mixlib-config (2.2.5)
- mixlib-log (2.0.1)
+ mixlib-log (2.0.3)
mixlib-shellout (2.3.2)
mixlib-shellout (2.3.2-universal-mingw32)
win32-process (~> 0.8.2)
diff --git a/VERSION b/VERSION
index d02cecea9f..de31f8e7c7 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.0.154 \ No newline at end of file
+14.0.155 \ 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 b1d272cc13..8a066cc6ca 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.0.154"
+ VERSION = "14.0.155"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 3119c5ad99..802a10b15d 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.0.154")
+ VERSION = Chef::VersionString.new("14.0.155")
end
#