diff options
| -rw-r--r-- | CHANGELOG.md | 7 | ||||
| -rw-r--r-- | Gemfile.lock | 14 | ||||
| -rw-r--r-- | VERSION | 2 | ||||
| -rw-r--r-- | chef-bin/lib/chef-bin/version.rb | 2 | ||||
| -rw-r--r-- | chef-config/lib/chef-config/version.rb | 2 | ||||
| -rw-r--r-- | lib/chef/version.rb | 2 |
6 files changed, 15 insertions, 14 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 4fcdeb0bc9..e47bd79adb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,15 +1,16 @@ <!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ --> -<!-- latest_release 15.4.68 --> -## [v15.4.68](https://github.com/chef/chef/tree/v15.4.68) (2019-11-06) +<!-- latest_release 15.4.69 --> +## [v15.4.69](https://github.com/chef/chef/tree/v15.4.69) (2019-11-06) #### Merged Pull Requests -- Remove useless search arg mangling [#9070](https://github.com/chef/chef/pull/9070) ([lamont-granquist](https://github.com/lamont-granquist)) +- fix the habitat package promotion tests [#9061](https://github.com/chef/chef/pull/9061) ([robbkidd](https://github.com/robbkidd)) <!-- latest_release --> <!-- release_rollup since=15.4.45 --> ### Changes not yet released to stable #### Merged Pull Requests +- fix the habitat package promotion tests [#9061](https://github.com/chef/chef/pull/9061) ([robbkidd](https://github.com/robbkidd)) <!-- 15.4.69 --> - Remove useless search arg mangling [#9070](https://github.com/chef/chef/pull/9070) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 15.4.68 --> - dist constants in win logs [#9058](https://github.com/chef/chef/pull/9058) ([bobchaos](https://github.com/bobchaos)) <!-- 15.4.67 --> - service/systemd_unit: Don't try to reenable services in an indirect status [#9047](https://github.com/chef/chef/pull/9047) ([jaymzh](https://github.com/jaymzh)) <!-- 15.4.66 --> diff --git a/Gemfile.lock b/Gemfile.lock index 8801c25431..dcc68e57cd 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -27,11 +27,11 @@ GIT PATH remote: . specs: - chef (15.4.68) + chef (15.4.69) addressable bcrypt_pbkdf (~> 1.0) bundler (>= 1.10) - chef-config (= 15.4.68) + chef-config (= 15.4.69) chef-zero (>= 14.0.11) diff-lcs (~> 1.2, >= 1.2.4) ed25519 (~> 1.2) @@ -58,11 +58,11 @@ PATH train-winrm (>= 0.2.5) tty-screen (~> 0.6) uuidtools (~> 2.1.5) - chef (15.4.68-universal-mingw32) + chef (15.4.69-universal-mingw32) addressable bcrypt_pbkdf (~> 1.0) bundler (>= 1.10) - chef-config (= 15.4.68) + chef-config (= 15.4.69) chef-zero (>= 14.0.11) diff-lcs (~> 1.2, >= 1.2.4) ed25519 (~> 1.2) @@ -105,13 +105,13 @@ PATH PATH remote: chef-bin specs: - chef-bin (15.4.68) - chef (= 15.4.68) + chef-bin (15.4.69) + chef (= 15.4.69) PATH remote: chef-config specs: - chef-config (15.4.68) + chef-config (15.4.69) addressable fuzzyurl mixlib-config (>= 2.2.12, < 4.0) @@ -1 +1 @@ -15.4.68
\ No newline at end of file +15.4.69
\ No newline at end of file diff --git a/chef-bin/lib/chef-bin/version.rb b/chef-bin/lib/chef-bin/version.rb index e047fd2f0f..06976a8953 100644 --- a/chef-bin/lib/chef-bin/version.rb +++ b/chef-bin/lib/chef-bin/version.rb @@ -21,7 +21,7 @@ module ChefBin CHEFBIN_ROOT = File.expand_path("../..", __FILE__) - VERSION = "15.4.68".freeze + VERSION = "15.4.69".freeze end # diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb index f4f9f97e07..d345e107b5 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 = "15.4.68".freeze + VERSION = "15.4.69".freeze end # diff --git a/lib/chef/version.rb b/lib/chef/version.rb index d1012e55d8..071365a95a 100644 --- a/lib/chef/version.rb +++ b/lib/chef/version.rb @@ -23,7 +23,7 @@ require_relative "version_string" class Chef CHEF_ROOT = File.expand_path("../..", __FILE__) - VERSION = Chef::VersionString.new("15.4.68") + VERSION = Chef::VersionString.new("15.4.69") end # |