summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <chef-ci@chef.io>2019-05-14 19:59:37 +0000
committerChef Expeditor <chef-ci@chef.io>2019-05-14 19:59:37 +0000
commitf80718e8f8ea97a9a0794a94e8e9640745524cab (patch)
tree4f385c6fb20a3d89e1d076724fb1026f4d10ca89
parent3d34cff81b255cd5de6b338fc4f7e64b4f5ae4bf (diff)
downloadchef-f80718e8f8ea97a9a0794a94e8e9640745524cab.tar.gz
Bump version to 15.0.294 by Chef Expeditorv15.0.294
Obvious fix; these changes are the result of automation not creative thinking.
-rw-r--r--CHANGELOG.md14
-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, 22 insertions, 14 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6b7be69582..3336465142 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release -->
+<!-- latest_release 15.0.294 -->
+## [v15.0.294](https://github.com/chef/chef/tree/v15.0.294) (2019-05-14)
+
+#### Merged Pull Requests
+- 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))
<!-- latest_release -->
-<!-- release_rollup -->
+<!-- release_rollup since=15.0.293 -->
+### Changes not yet released to rubygems.org
+
+#### Merged Pull Requests
+- 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 -->
<!-- release_rollup -->
<!-- latest_stable_release -->
@@ -2733,4 +2741,4 @@ of partial templates.
* Fixed a bug where nested resources that inherited from Resource::LWRPBase
would not share the same actions/default_action as their parent
* Raise error if a guard_interpreter is specified and a block is passed to a guard (conditional)
-* Allow specifying a guard_interpreter after a conditional on a resource (Fixes #1943)
+* Allow specifying a guard_interpreter after a conditional on a resource (Fixes #1943) \ No newline at end of file
diff --git a/Gemfile.lock b/Gemfile.lock
index 6b291ca1eb..d3857ff7db 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -27,11 +27,11 @@ GIT
PATH
remote: .
specs:
- chef (15.0.293)
+ chef (15.0.294)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
- chef-config (= 15.0.293)
+ chef-config (= 15.0.294)
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.293-universal-mingw32)
+ chef (15.0.294-universal-mingw32)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
- chef-config (= 15.0.293)
+ chef-config (= 15.0.294)
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.293)
- chef (= 15.0.293)
+ chef-bin (15.0.294)
+ chef (= 15.0.294)
PATH
remote: chef-config
specs:
- chef-config (15.0.293)
+ chef-config (15.0.294)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 4.0)
diff --git a/VERSION b/VERSION
index fd0e6ae6a9..d0b9b11c42 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.0.293 \ No newline at end of file
+15.0.294 \ 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 3581707ded..b634a030d8 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.293".freeze
+ VERSION = "15.0.294".freeze
end
#
diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb
index 6ba256d3b8..36b21675ff 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.293".freeze
+ VERSION = "15.0.294".freeze
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index d9e648fae9..dc7bf5e4d3 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.293")
+ VERSION = Chef::VersionString.new("15.0.294")
end
#