summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <chef-ci@chef.io>2019-05-11 00:51:02 +0000
committerChef Expeditor <chef-ci@chef.io>2019-05-11 00:51:02 +0000
commit91ef348e8039ea181f785a714fa317d421ac439e (patch)
tree1b0badcb45cd8e5b3527af089d0f4b0e4c99ab02
parent7df11900e079f82e73f7469bf22013f0fc49e213 (diff)
downloadchef-91ef348e8039ea181f785a714fa317d421ac439e.tar.gz
Bump version to 15.0.285 by Chef Expeditorv15.0.285
Obvious fix; these changes are the result of automation not creative thinking.
-rw-r--r--CHANGELOG.md6
-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, 13 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index ec0e13776c..22db51f0f0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,9 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release unreleased -->
-## Unreleased
+<!-- latest_release 15.0.285 -->
+## [v15.0.285](https://github.com/chef/chef/tree/v15.0.285) (2019-05-11)
#### Merged Pull Requests
+- Use exports compatibile with /bin/sh in the bootstrap script [#8507](https://github.com/chef/chef/pull/8507) ([MarkGibbons](https://github.com/MarkGibbons))
- Add comments to the Dockerfile explaining how it all works [#8509](https://github.com/chef/chef/pull/8509) ([tas50](https://github.com/tas50))
<!-- latest_release -->
@@ -10,6 +11,7 @@
### Changes since latest stable release
#### Merged Pull Requests
+- Use exports compatibile with /bin/sh in the bootstrap script [#8507](https://github.com/chef/chef/pull/8507) ([MarkGibbons](https://github.com/MarkGibbons)) <!-- 15.0.285 -->
- Add comments to the Dockerfile explaining how it all works [#8509](https://github.com/chef/chef/pull/8509) ([tas50](https://github.com/tas50)) <!-- 15.0.284 -->
- Chef 15: bootstrap options --max-wait raises NoMethodError: undefined method / [#8489](https://github.com/chef/chef/pull/8489) ([vsingh-msys](https://github.com/vsingh-msys)) <!-- 15.0.284 -->
- Fix for Chef::Exceptions::Win32APIError: The operation completed successfully. [#8451](https://github.com/chef/chef/pull/8451) ([kapilchouhan99](https://github.com/kapilchouhan99)) <!-- 15.0.283 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 24d0c124bd..262c68faec 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -27,11 +27,11 @@ GIT
PATH
remote: .
specs:
- chef (15.0.284)
+ chef (15.0.285)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
- chef-config (= 15.0.284)
+ chef-config (= 15.0.285)
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.284-universal-mingw32)
+ chef (15.0.285-universal-mingw32)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
- chef-config (= 15.0.284)
+ chef-config (= 15.0.285)
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.284)
- chef (= 15.0.284)
+ chef-bin (15.0.285)
+ chef (= 15.0.285)
PATH
remote: chef-config
specs:
- chef-config (15.0.284)
+ chef-config (15.0.285)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 4.0)
diff --git a/VERSION b/VERSION
index ce463e9ff0..f7c0c966f2 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.0.284 \ No newline at end of file
+15.0.285 \ 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 906d7fb5a3..c3f3b65a66 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.284".freeze
+ VERSION = "15.0.285".freeze
end
#
diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb
index dabab6f48d..08229cb52e 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.284".freeze
+ VERSION = "15.0.285".freeze
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index f9b82206d9..825339e0dd 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.284")
+ VERSION = Chef::VersionString.new("15.0.285")
end
#