summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <chef-ci@chef.io>2019-04-29 23:32:05 +0000
committerChef Expeditor <chef-ci@chef.io>2019-04-29 23:32:05 +0000
commit7385e243fc280f26f7008fdd3a943904be929459 (patch)
tree51ae7b3ec41d2f75af0d15ca55548cae2ed32fa3
parent77f6acce07f7c801c74d638d00b8a0779e55afa3 (diff)
downloadchef-7385e243fc280f26f7008fdd3a943904be929459.tar.gz
Bump version to 15.0.240 by Chef Expeditorv15.0.240
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 3355da5153..653c120500 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.239 -->
-## [v15.0.239](https://github.com/chef/chef/tree/v15.0.239) (2019-04-29)
+<!-- latest_release 15.0.240 -->
+## [v15.0.240](https://github.com/chef/chef/tree/v15.0.240) (2019-04-29)
#### Merged Pull Requests
-- Enable license acceptance during bootstrap [#8411](https://github.com/chef/chef/pull/8411) ([marcparadise](https://github.com/marcparadise))
+- Remove chef-* bin files from chef gem [#8413](https://github.com/chef/chef/pull/8413) ([lamont-granquist](https://github.com/lamont-granquist))
<!-- latest_release -->
<!-- release_rollup -->
### Changes since latest stable release
#### Merged Pull Requests
+- Remove chef-* bin files from chef gem [#8413](https://github.com/chef/chef/pull/8413) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 15.0.240 -->
- Enable license acceptance during bootstrap [#8411](https://github.com/chef/chef/pull/8411) ([marcparadise](https://github.com/marcparadise)) <!-- 15.0.239 -->
- Implement bootstrap directly with train [#8419](https://github.com/chef/chef/pull/8419) ([marcparadise](https://github.com/marcparadise)) <!-- 15.0.238 -->
- &quot;chef-client&quot; =&gt; #{Chef::Dist::CLIENT} [#8418](https://github.com/chef/chef/pull/8418) ([bobchaos](https://github.com/bobchaos)) <!-- 15.0.237 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 711c777735..4b661ff70d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -27,11 +27,11 @@ GIT
PATH
remote: .
specs:
- chef (15.0.239)
+ chef (15.0.240)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
- chef-config (= 15.0.239)
+ chef-config (= 15.0.240)
chef-zero (>= 14.0.11)
diff-lcs (~> 1.2, >= 1.2.4)
ed25519 (~> 1.2)
@@ -56,11 +56,11 @@ PATH
train-core (~> 2.0, >= 2.0.12)
tty-screen (~> 0.6)
uuidtools (~> 2.1.5)
- chef (15.0.239-universal-mingw32)
+ chef (15.0.240-universal-mingw32)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
- chef-config (= 15.0.239)
+ chef-config (= 15.0.240)
chef-zero (>= 14.0.11)
diff-lcs (~> 1.2, >= 1.2.4)
ed25519 (~> 1.2)
@@ -101,13 +101,13 @@ PATH
PATH
remote: chef-bin
specs:
- chef-bin (15.0.237)
- chef (= 15.0.237)
+ chef-bin (15.0.240)
+ chef (= 15.0.240)
PATH
remote: chef-config
specs:
- chef-config (15.0.239)
+ chef-config (15.0.240)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 4.0)
diff --git a/VERSION b/VERSION
index c1d249410b..ddf3615120 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.0.239 \ No newline at end of file
+15.0.240 \ 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 9916e6b5fa..ec293c8eae 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.237".freeze
+ VERSION = "15.0.240".freeze
end
#
diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb
index 6ca0471605..22ebbc26f2 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.239".freeze
+ VERSION = "15.0.240".freeze
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 2f74e5a1a8..5d97f6bd31 100644
--- a/lib/chef/version.rb
+++ b/lib/chef/version.rb
@@ -23,7 +23,7 @@ require "chef/version_string"
class Chef
CHEF_ROOT = File.expand_path("../..", __FILE__)
- VERSION = Chef::VersionString.new("15.0.239")
+ VERSION = Chef::VersionString.new("15.0.240")
end
#