summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <chef-ci@chef.io>2019-05-20 20:04:28 +0000
committerChef Expeditor <chef-ci@chef.io>2019-05-20 20:04:28 +0000
commitdfe11864d3a347ba991f53b9fd74cde24a9b60b7 (patch)
tree55894129095cab0ab45015eb4ddba0886a734edf
parent99cf0ead6e260e471294fd17ea1e17bdf49df3b7 (diff)
downloadchef-dfe11864d3a347ba991f53b9fd74cde24a9b60b7.tar.gz
Bump version to 15.0.302 by Chef Expeditorv15.0.302
Obvious fix; these changes are the result of automation not creative thinking.
-rw-r--r--CHANGELOG.md7
-rw-r--r--Gemfile.lock14
-rw-r--r--VERSION2
-rw-r--r--chef-bin/lib/chef-bin/version.rb2
-rw-r--r--chef-config/lib/chef-config/version.rb2
-rw-r--r--lib/chef/version.rb2
6 files changed, 15 insertions, 14 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f5cad1c903..0b40e6813c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 15.0.301 -->
-## [v15.0.301](https://github.com/chef/chef/tree/v15.0.301) (2019-05-16)
+<!-- latest_release 15.0.302 -->
+## [v15.0.302](https://github.com/chef/chef/tree/v15.0.302) (2019-05-20)
#### Merged Pull Requests
-- Chef Infra Client 15 Release Notes Additional edits [#8543](https://github.com/chef/chef/pull/8543) ([mjingle](https://github.com/mjingle))
+- Only set client_pem in bootstrap_context when validatorless [#8567](https://github.com/chef/chef/pull/8567) ([btm](https://github.com/btm))
<!-- latest_release -->
<!-- release_rollup since=15.0.300 -->
### Changes not yet released to rubygems.org
#### Merged Pull Requests
+- Only set client_pem in bootstrap_context when validatorless [#8567](https://github.com/chef/chef/pull/8567) ([btm](https://github.com/btm)) <!-- 15.0.302 -->
- Chef Infra Client 15 Release Notes Additional edits [#8543](https://github.com/chef/chef/pull/8543) ([mjingle](https://github.com/mjingle)) <!-- 15.0.301 -->
<!-- release_rollup -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 478a8f64a0..866f8d48b5 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -27,11 +27,11 @@ GIT
PATH
remote: .
specs:
- chef (15.0.301)
+ chef (15.0.302)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
- chef-config (= 15.0.301)
+ chef-config (= 15.0.302)
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.0.301-universal-mingw32)
+ chef (15.0.302-universal-mingw32)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
- chef-config (= 15.0.301)
+ chef-config (= 15.0.302)
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.0.301)
- chef (= 15.0.301)
+ chef-bin (15.0.302)
+ chef (= 15.0.302)
PATH
remote: chef-config
specs:
- chef-config (15.0.301)
+ chef-config (15.0.302)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 4.0)
diff --git a/VERSION b/VERSION
index a771cf556d..b41355a180 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.0.301 \ No newline at end of file
+15.0.302 \ 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 1c4412406f..d6019b44e7 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.0.301".freeze
+ VERSION = "15.0.302".freeze
end
#
diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb
index 911df3c55d..c213c3d8be 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.0.301".freeze
+ VERSION = "15.0.302".freeze
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 979dab7e67..b39478608e 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.0.301")
+ VERSION = Chef::VersionString.new("15.0.302")
end
#