diff options
| -rw-r--r-- | CHANGELOG.md | 7 | ||||
| -rw-r--r-- | Gemfile.lock | 10 | ||||
| -rw-r--r-- | VERSION | 2 | ||||
| -rw-r--r-- | chef-config/lib/chef-config/version.rb | 2 | ||||
| -rw-r--r-- | lib/chef/version.rb | 2 |
5 files changed, 12 insertions, 11 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 88dcb3797a..c0abbc2825 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.124 --> -## [v14.0.124](https://github.com/chef/chef/tree/v14.0.124) (2018-03-12) +<!-- latest_release 14.0.125 --> +## [v14.0.125](https://github.com/chef/chef/tree/v14.0.125) (2018-03-12) #### Merged Pull Requests -- RFC 106: expose name and chef_environment as attrs [#6967](https://github.com/chef/chef/pull/6967) ([thommay](https://github.com/thommay)) +- Use node.override not node.normal in the windows_feature_dism resource [#6962](https://github.com/chef/chef/pull/6962) ([tas50](https://github.com/tas50)) <!-- latest_release --> <!-- release_rollup since=13.7.16 --> ### Changes since 13.7.16 release #### Merged Pull Requests +- Use node.override not node.normal in the windows_feature_dism resource [#6962](https://github.com/chef/chef/pull/6962) ([tas50](https://github.com/tas50)) <!-- 14.0.125 --> - RFC 106: expose name and chef_environment as attrs [#6967](https://github.com/chef/chef/pull/6967) ([thommay](https://github.com/thommay)) <!-- 14.0.124 --> - Remove the manpages [#6974](https://github.com/chef/chef/pull/6974) ([tas50](https://github.com/tas50)) <!-- 14.0.123 --> - New interop between Chef and PowerShell 4.0 (or higher) [#6941](https://github.com/chef/chef/pull/6941) ([stuartpreston](https://github.com/stuartpreston)) <!-- 14.0.122 --> diff --git a/Gemfile.lock b/Gemfile.lock index 4ba8ebb855..072f4be442 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -27,10 +27,10 @@ GIT PATH remote: . specs: - chef (14.0.124) + chef (14.0.125) addressable bundler (>= 1.10) - chef-config (= 14.0.124) + chef-config (= 14.0.125) chef-zero (>= 13.0) diff-lcs (~> 1.2, >= 1.2.4) erubis (~> 2.7) @@ -57,10 +57,10 @@ PATH specinfra (~> 2.10) syslog-logger (~> 1.6) uuidtools (~> 2.1.5) - chef (14.0.124-universal-mingw32) + chef (14.0.125-universal-mingw32) addressable bundler (>= 1.10) - chef-config (= 14.0.124) + chef-config (= 14.0.125) chef-zero (>= 13.0) diff-lcs (~> 1.2, >= 1.2.4) erubis (~> 2.7) @@ -102,7 +102,7 @@ PATH PATH remote: chef-config specs: - chef-config (14.0.124) + chef-config (14.0.125) addressable fuzzyurl mixlib-config (~> 2.0) @@ -1 +1 @@ -14.0.124
\ No newline at end of file +14.0.125
\ 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 05d61ee7f2..0b97e3f358 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.124" + VERSION = "14.0.125" end # diff --git a/lib/chef/version.rb b/lib/chef/version.rb index 416c8428f6..095424c0a7 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.124") + VERSION = Chef::VersionString.new("14.0.125") end # |