diff options
author | Chef Expeditor <expeditor@chef.io> | 2019-10-10 19:10:30 +0000 |
---|---|---|
committer | Chef Expeditor <expeditor@chef.io> | 2019-10-10 19:10:30 +0000 |
commit | af84331d25595728e0521a7d4dee816d310846e4 (patch) | |
tree | 2a5f89cd55404287df0dd5ced5113ce2adb1d51a | |
parent | 6f05a4ca5659e47e7cc2a349036b836a84889a78 (diff) | |
download | chef-af84331d25595728e0521a7d4dee816d310846e4.tar.gz |
Bump version to 15.4.35 by Chef Expeditorv15.4.35
Obvious fix; these changes are the result of automation not creative thinking.
-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 a90b3a96ff..9d62b66479 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.34 --> -## [v15.4.34](https://github.com/chef/chef/tree/v15.4.34) (2019-10-09) +<!-- latest_release 15.4.35 --> +## [v15.4.35](https://github.com/chef/chef/tree/v15.4.35) (2019-10-10) #### Merged Pull Requests -- windows_ad_join: Add :leave action to for leaving an AD domain [#8379](https://github.com/chef/chef/pull/8379) ([jasonwbarnett](https://github.com/jasonwbarnett)) +- windows_service: don't update the service if the run_as_user ca… [#8981](https://github.com/chef/chef/pull/8981) ([jasonwbarnett](https://github.com/jasonwbarnett)) <!-- latest_release --> <!-- release_rollup since=15.3.14 --> ### Changes not yet released to stable #### Merged Pull Requests +- windows_service: don't update the service if the run_as_user ca… [#8981](https://github.com/chef/chef/pull/8981) ([jasonwbarnett](https://github.com/jasonwbarnett)) <!-- 15.4.35 --> - windows_ad_join: Add :leave action to for leaving an AD domain [#8379](https://github.com/chef/chef/pull/8379) ([jasonwbarnett](https://github.com/jasonwbarnett)) <!-- 15.4.34 --> - Require train ~3.1 for bootstrapping and openssl 1.0.2t [#8968](https://github.com/chef/chef/pull/8968) ([tas50](https://github.com/tas50)) <!-- 15.4.33 --> - Fix Bootstrap password prompt [#8856](https://github.com/chef/chef/pull/8856) ([samshinde](https://github.com/samshinde)) <!-- 15.4.32 --> diff --git a/Gemfile.lock b/Gemfile.lock index 67333a35ea..b7088b5a97 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -27,11 +27,11 @@ GIT PATH remote: . specs: - chef (15.4.34) + chef (15.4.35) addressable bcrypt_pbkdf (~> 1.0) bundler (>= 1.10) - chef-config (= 15.4.34) + chef-config (= 15.4.35) 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.34-universal-mingw32) + chef (15.4.35-universal-mingw32) addressable bcrypt_pbkdf (~> 1.0) bundler (>= 1.10) - chef-config (= 15.4.34) + chef-config (= 15.4.35) 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.34) - chef (= 15.4.34) + chef-bin (15.4.35) + chef (= 15.4.35) PATH remote: chef-config specs: - chef-config (15.4.34) + chef-config (15.4.35) addressable fuzzyurl mixlib-config (>= 2.2.12, < 4.0) @@ -1 +1 @@ -15.4.34
\ No newline at end of file +15.4.35
\ 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 73b05d07a9..60d14d15dd 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.34".freeze + VERSION = "15.4.35".freeze end # diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb index 60baae8b0f..80785edf1a 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.34".freeze + VERSION = "15.4.35".freeze end # diff --git a/lib/chef/version.rb b/lib/chef/version.rb index 4b61a10c9f..5dd4c7f4ea 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.34") + VERSION = Chef::VersionString.new("15.4.35") end # |