diff options
| author | Chef Expeditor <eng-services-ops+chef-ci@chef.io> | 2018-03-06 18:01:13 +0000 |
|---|---|---|
| committer | Chef Expeditor <eng-services-ops+chef-ci@chef.io> | 2018-03-06 18:01:13 +0000 |
| commit | 30ee30b9b4806d8dbc81853a019dc99cbe4adfe1 (patch) | |
| tree | 5d4114ba823d4bc61fbfa41639f5f324b2379029 | |
| parent | 6d9ae0928a51a79ca24d4f89ff00fabc97fa43b0 (diff) | |
| download | chef-30ee30b9b4806d8dbc81853a019dc99cbe4adfe1.tar.gz | |
Bump version to 14.0.118 by Expeditorv14.0.118
| -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 d95a015ead..4240821c07 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.117 --> -## [v14.0.117](https://github.com/chef/chef/tree/v14.0.117) (2018-03-06) +<!-- latest_release 14.0.118 --> +## [v14.0.118](https://github.com/chef/chef/tree/v14.0.118) (2018-03-06) #### Merged Pull Requests -- Added source_file to FromFile [#6938](https://github.com/chef/chef/pull/6938) ([zfjagann](https://github.com/zfjagann)) +- remove deprecated property namespace collisions [#6952](https://github.com/chef/chef/pull/6952) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- latest_release --> <!-- release_rollup since=13.7.16 --> ### Changes since 13.7.16 release #### Merged Pull Requests +- remove deprecated property namespace collisions [#6952](https://github.com/chef/chef/pull/6952) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 14.0.118 --> - Added source_file to FromFile [#6938](https://github.com/chef/chef/pull/6938) ([zfjagann](https://github.com/zfjagann)) <!-- 14.0.117 --> - Avoid compile time error in apt_repository [#6953](https://github.com/chef/chef/pull/6953) ([tas50](https://github.com/tas50)) <!-- 14.0.116 --> - Remove support for Windows 2003 [#6923](https://github.com/chef/chef/pull/6923) ([tas50](https://github.com/tas50)) <!-- 14.0.115 --> diff --git a/Gemfile.lock b/Gemfile.lock index 4a6b4be3eb..b7449c117b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -27,10 +27,10 @@ GIT PATH remote: . specs: - chef (14.0.117) + chef (14.0.118) addressable bundler (>= 1.10) - chef-config (= 14.0.117) + chef-config (= 14.0.118) 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.117-universal-mingw32) + chef (14.0.118-universal-mingw32) addressable bundler (>= 1.10) - chef-config (= 14.0.117) + chef-config (= 14.0.118) 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.117) + chef-config (14.0.118) addressable fuzzyurl mixlib-config (~> 2.0) @@ -1 +1 @@ -14.0.117
\ No newline at end of file +14.0.118
\ 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 d1b105b410..b84975edca 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.117" + VERSION = "14.0.118" end # diff --git a/lib/chef/version.rb b/lib/chef/version.rb index 0944fe4bb1..f382f0637a 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.117") + VERSION = Chef::VersionString.new("14.0.118") end # |