diff options
author | Chef Expeditor <chef-ci@chef.io> | 2019-07-01 17:35:11 +0000 |
---|---|---|
committer | Chef Expeditor <chef-ci@chef.io> | 2019-07-01 17:35:11 +0000 |
commit | 46c271a5bb065ee01650309e2ccaac88283b7f29 (patch) | |
tree | 08acdfa07a52629890952b4ac2611cfe862bf580 | |
parent | df3031c1c88b6cdd5d9d1d5dfe461916962071ab (diff) | |
download | chef-46c271a5bb065ee01650309e2ccaac88283b7f29.tar.gz |
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 813fe49c1e..3582550731 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,15 +1,16 @@ <!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ --> -<!-- latest_release 15.1.35 --> -## [v15.1.35](https://github.com/chef/chef/tree/v15.1.35) (2019-07-01) +<!-- latest_release 15.1.36 --> +## [v15.1.36](https://github.com/chef/chef/tree/v15.1.36) (2019-07-01) #### Merged Pull Requests -- Bump train-core to 2.1.13 [#8699](https://github.com/chef/chef/pull/8699) ([chef-ci](https://github.com/chef-ci)) +- Pass yum_package options to underlying python helper [#8687](https://github.com/chef/chef/pull/8687) ([Annih](https://github.com/Annih)) <!-- latest_release --> <!-- release_rollup since=15.0.300 --> ### Changes not yet released to rubygems.org #### Merged Pull Requests +- Pass yum_package options to underlying python helper [#8687](https://github.com/chef/chef/pull/8687) ([Annih](https://github.com/Annih)) <!-- 15.1.36 --> - Bump train-core to 2.1.13 [#8699](https://github.com/chef/chef/pull/8699) ([chef-ci](https://github.com/chef-ci)) <!-- 15.1.35 --> - Rename the habitat package to chef-infra-client [#8698](https://github.com/chef/chef/pull/8698) ([tas50](https://github.com/tas50)) <!-- 15.1.34 --> - Add rake task for generating the docs site content [#8694](https://github.com/chef/chef/pull/8694) ([tas50](https://github.com/tas50)) <!-- 15.1.33 --> diff --git a/Gemfile.lock b/Gemfile.lock index 977e473eb5..6bd93c6412 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -27,11 +27,11 @@ GIT PATH remote: . specs: - chef (15.1.35) + chef (15.1.36) addressable bcrypt_pbkdf (~> 1.0) bundler (>= 1.10) - chef-config (= 15.1.35) + chef-config (= 15.1.36) chef-zero (>= 14.0.11) diff-lcs (~> 1.2, >= 1.2.4) ed25519 (~> 1.2) @@ -57,11 +57,11 @@ PATH train-core (~> 2.0, >= 2.0.12) tty-screen (~> 0.6) uuidtools (~> 2.1.5) - chef (15.1.35-universal-mingw32) + chef (15.1.36-universal-mingw32) addressable bcrypt_pbkdf (~> 1.0) bundler (>= 1.10) - chef-config (= 15.1.35) + chef-config (= 15.1.36) chef-zero (>= 14.0.11) diff-lcs (~> 1.2, >= 1.2.4) ed25519 (~> 1.2) @@ -103,13 +103,13 @@ PATH PATH remote: chef-bin specs: - chef-bin (15.1.35) - chef (= 15.1.35) + chef-bin (15.1.36) + chef (= 15.1.36) PATH remote: chef-config specs: - chef-config (15.1.35) + chef-config (15.1.36) addressable fuzzyurl mixlib-config (>= 2.2.12, < 4.0) @@ -1 +1 @@ -15.1.35
\ No newline at end of file +15.1.36
\ 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 6a730a2518..6a761a1763 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.1.35".freeze + VERSION = "15.1.36".freeze end # diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb index 7130a17363..23a11dd137 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.1.35".freeze + VERSION = "15.1.36".freeze end # diff --git a/lib/chef/version.rb b/lib/chef/version.rb index 84047c00c9..02532df098 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.1.35") + VERSION = Chef::VersionString.new("15.1.36") end # |