summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <chef-ci@chef.io>2019-05-15 17:55:55 +0000
committerChef Expeditor <chef-ci@chef.io>2019-05-15 17:55:55 +0000
commit94e341db5197050512d91e09cfabbae305f49fba (patch)
treed780632451069e97208f8fe42589ee23a17bfcf8
parent33af718399e84c71fd586153b97cf70a2bf8dded (diff)
downloadchef-94e341db5197050512d91e09cfabbae305f49fba.tar.gz
Bump version to 15.0.297 by Chef Expeditorv15.0.297
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 7c391632ad..b3be52a4ef 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.296 -->
-## [v15.0.296](https://github.com/chef/chef/tree/v15.0.296) (2019-05-15)
+<!-- latest_release 15.0.297 -->
+## [v15.0.297](https://github.com/chef/chef/tree/v15.0.297) (2019-05-15)
#### Merged Pull Requests
-- Bump license-acceptance to 1.0.11 to resolve failures on Windows 2016 [#8551](https://github.com/chef/chef/pull/8551) ([aaronwalker](https://github.com/aaronwalker))
+- Multiple Bootstrap bug fixes [#8539](https://github.com/chef/chef/pull/8539) ([marcparadise](https://github.com/marcparadise))
<!-- latest_release -->
<!-- release_rollup since=15.0.293 -->
### Changes not yet released to rubygems.org
#### Merged Pull Requests
+- Multiple Bootstrap bug fixes [#8539](https://github.com/chef/chef/pull/8539) ([marcparadise](https://github.com/marcparadise)) <!-- 15.0.297 -->
- Bump license-acceptance to 1.0.11 to resolve failures on Windows 2016 [#8551](https://github.com/chef/chef/pull/8551) ([aaronwalker](https://github.com/aaronwalker)) <!-- 15.0.296 -->
- Update habitat/plan.sh to allow building of Chef Infra Client 15 [#8552](https://github.com/chef/chef/pull/8552) ([smacfarlane](https://github.com/smacfarlane)) <!-- 15.0.295 -->
- Bump license-acceptance to 1.0.8 to resolve failures on Windows 2012R2 [#8538](https://github.com/chef/chef/pull/8538) ([chef-ci](https://github.com/chef-ci)) <!-- 15.0.294 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 0071dcd5ae..361b7b7f2a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -27,11 +27,11 @@ GIT
PATH
remote: .
specs:
- chef (15.0.296)
+ chef (15.0.297)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
- chef-config (= 15.0.296)
+ chef-config (= 15.0.297)
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.296-universal-mingw32)
+ chef (15.0.297-universal-mingw32)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
- chef-config (= 15.0.296)
+ chef-config (= 15.0.297)
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.296)
- chef (= 15.0.296)
+ chef-bin (15.0.297)
+ chef (= 15.0.297)
PATH
remote: chef-config
specs:
- chef-config (15.0.296)
+ chef-config (15.0.297)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 4.0)
diff --git a/VERSION b/VERSION
index 3ef5792b9a..2c40cc50f5 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.0.296 \ No newline at end of file
+15.0.297 \ 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 995f1070b5..7a806466d3 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.296".freeze
+ VERSION = "15.0.297".freeze
end
#
diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb
index cd4b96b754..b5f4da07a1 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.296".freeze
+ VERSION = "15.0.297".freeze
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 9282d00574..f100bb9e9e 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.296")
+ VERSION = Chef::VersionString.new("15.0.297")
end
#