diff options
| author | Chef Expeditor <eng-services-ops+chef-ci@chef.io> | 2018-01-19 10:39:47 +0000 |
|---|---|---|
| committer | Chef Expeditor <eng-services-ops+chef-ci@chef.io> | 2018-01-19 10:39:47 +0000 |
| commit | 9024df6d5d7162787a42efb7fa1c482299773985 (patch) | |
| tree | c50cd7dc824cf4426a42ed4bab5618cf05e5774f | |
| parent | 50b4d19cc93685c55705035af04d04a01a060982 (diff) | |
| download | chef-9024df6d5d7162787a42efb7fa1c482299773985.tar.gz | |
Bump version to 13.7.15 by Expeditorv13.7.15
| -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 6238454899..c28595f5b7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,15 +1,16 @@ <!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ --> -<!-- latest_release 13.7.14 --> -## [v13.7.14](https://github.com/chef/chef/tree/v13.7.14) (2018-01-19) +<!-- latest_release 13.7.15 --> +## [v13.7.15](https://github.com/chef/chef/tree/v13.7.15) (2018-01-19) #### Merged Pull Requests -- fix double-logging bug [#6752](https://github.com/chef/chef/pull/6752) ([lamont-granquist](https://github.com/lamont-granquist)) +- Revert deprecation of use_inline_resources [#6754](https://github.com/chef/chef/pull/6754) ([tas50](https://github.com/tas50)) <!-- latest_release --> <!-- release_rollup since=13.6.4 --> ### Changes since 13.6.4 release #### Merged Pull Requests +- Revert deprecation of use_inline_resources [#6754](https://github.com/chef/chef/pull/6754) ([tas50](https://github.com/tas50)) <!-- 13.7.15 --> - fix double-logging bug [#6752](https://github.com/chef/chef/pull/6752) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 13.7.14 --> - Add a warning that Chef 11 server support in knife user is deprecated [#6725](https://github.com/chef/chef/pull/6725) ([tas50](https://github.com/tas50)) <!-- 13.7.13 --> - fix non-daemonized umask [#6745](https://github.com/chef/chef/pull/6745) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 13.7.12 --> diff --git a/Gemfile.lock b/Gemfile.lock index c3f5ad4dd2..a0c2a5eb40 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -17,10 +17,10 @@ GIT PATH remote: . specs: - chef (13.7.14) + chef (13.7.15) addressable bundler (>= 1.10) - chef-config (= 13.7.14) + chef-config (= 13.7.15) chef-zero (>= 13.0) diff-lcs (~> 1.2, >= 1.2.4) erubis (~> 2.7) @@ -47,10 +47,10 @@ PATH specinfra (~> 2.10) syslog-logger (~> 1.6) uuidtools (~> 2.1.5) - chef (13.7.14-universal-mingw32) + chef (13.7.15-universal-mingw32) addressable bundler (>= 1.10) - chef-config (= 13.7.14) + chef-config (= 13.7.15) chef-zero (>= 13.0) diff-lcs (~> 1.2, >= 1.2.4) erubis (~> 2.7) @@ -92,7 +92,7 @@ PATH PATH remote: chef-config specs: - chef-config (13.7.14) + chef-config (13.7.15) addressable fuzzyurl mixlib-config (~> 2.0) @@ -1 +1 @@ -13.7.14
\ No newline at end of file +13.7.15
\ 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 22e0b8d463..fdc0c74d88 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 = "13.7.14" + VERSION = "13.7.15" end # diff --git a/lib/chef/version.rb b/lib/chef/version.rb index 5653d86ab2..7d88a8cc0c 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("13.7.14") + VERSION = Chef::VersionString.new("13.7.15") end # |