summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-03-28 03:24:56 +0000
committerChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-03-28 03:24:56 +0000
commit2151d6d435f6169ca41dc1f96324a3585ff22e06 (patch)
tree457231638aa5243b8ca1983e8bde8cf7eeb49e5a
parent1775822934b6f42791cf46454027a3a17f14e726 (diff)
downloadchef-14.0.174.tar.gz
Bump version to 14.0.174 by Expeditorv14.0.174
-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 4f63fabe90..4feb944cc1 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.173 -->
-## [v14.0.173](https://github.com/chef/chef/tree/v14.0.173) (2018-03-27)
+<!-- latest_release 14.0.174 -->
+## [v14.0.174](https://github.com/chef/chef/tree/v14.0.174) (2018-03-28)
#### Merged Pull Requests
-- Fix array parsing in windows_feature_dism / windows_feature_powershell [#7078](https://github.com/chef/chef/pull/7078) ([tas50](https://github.com/tas50))
+- Setting nil to properties with implicit nil sets default value [#7037](https://github.com/chef/chef/pull/7037) ([lamont-granquist](https://github.com/lamont-granquist))
<!-- latest_release -->
<!-- release_rollup since=13.8.5 -->
### Changes since 13.8.5 release
#### Merged Pull Requests
+- Setting nil to properties with implicit nil sets default value [#7037](https://github.com/chef/chef/pull/7037) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 14.0.174 -->
- Fix array parsing in windows_feature_dism / windows_feature_powershell [#7078](https://github.com/chef/chef/pull/7078) ([tas50](https://github.com/tas50)) <!-- 14.0.173 -->
- Add Chef 13.8 and 14.0 release notes [#7074](https://github.com/chef/chef/pull/7074) ([tas50](https://github.com/tas50)) <!-- 14.0.172 -->
- Sudo resource: specify ruby type for visudo_binary [#7076](https://github.com/chef/chef/pull/7076) ([brewn](https://github.com/brewn)) <!-- 14.0.171 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index c317112a72..7688a6731d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -15,10 +15,10 @@ GIT
PATH
remote: .
specs:
- chef (14.0.173)
+ chef (14.0.174)
addressable
bundler (>= 1.10)
- chef-config (= 14.0.173)
+ chef-config (= 14.0.174)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -45,10 +45,10 @@ PATH
specinfra (~> 2.10)
syslog-logger (~> 1.6)
uuidtools (~> 2.1.5)
- chef (14.0.173-universal-mingw32)
+ chef (14.0.174-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 14.0.173)
+ chef-config (= 14.0.174)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -90,7 +90,7 @@ PATH
PATH
remote: chef-config
specs:
- chef-config (14.0.173)
+ chef-config (14.0.174)
addressable
fuzzyurl
mixlib-config (~> 2.0)
diff --git a/VERSION b/VERSION
index 37ef896f81..0f1c6e9e62 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.0.173 \ No newline at end of file
+14.0.174 \ 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 253c7f4f53..c1ba94d9b8 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.173"
+ VERSION = "14.0.174"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index b6a91c4d67..223383c58f 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.173")
+ VERSION = Chef::VersionString.new("14.0.174")
end
#