summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <chef-ci@chef.io>2019-04-23 23:42:05 +0000
committerChef Expeditor <chef-ci@chef.io>2019-04-23 23:42:05 +0000
commit4efd6697fa91d45fa76e9b20e57fd214e664401b (patch)
treeebaae4b94ab7ebc4e289086bac5a166952f89d9b
parent466372e1020098094cec9d0777157fb12d37750c (diff)
downloadchef-4efd6697fa91d45fa76e9b20e57fd214e664401b.tar.gz
Bump version to 15.0.230 by Chef Expeditorv15.0.230
Obvious fix; these changes are the result of automation not creative thinking.
-rw-r--r--CHANGELOG.md7
-rw-r--r--Gemfile.lock10
-rw-r--r--VERSION2
-rw-r--r--chef-config/lib/chef-config/version.rb2
-rw-r--r--lib/chef/version.rb2
5 files changed, 12 insertions, 11 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0cc960d650..c8bd4a459c 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.229 -->
-## [v15.0.229](https://github.com/chef/chef/tree/v15.0.229) (2019-04-22)
+<!-- latest_release 15.0.230 -->
+## [v15.0.230](https://github.com/chef/chef/tree/v15.0.230) (2019-04-23)
#### Merged Pull Requests
-- Switch to inspec/train from gems [#8407](https://github.com/chef/chef/pull/8407) ([tas50](https://github.com/tas50))
+- Add Chef::Dist to abstract branding details to a single location [#8368](https://github.com/chef/chef/pull/8368) ([bobchaos](https://github.com/bobchaos))
<!-- latest_release -->
<!-- release_rollup -->
### Changes since latest stable release
#### Merged Pull Requests
+- Add Chef::Dist to abstract branding details to a single location [#8368](https://github.com/chef/chef/pull/8368) ([bobchaos](https://github.com/bobchaos)) <!-- 15.0.230 -->
- Switch to inspec/train from gems [#8407](https://github.com/chef/chef/pull/8407) ([tas50](https://github.com/tas50)) <!-- 15.0.229 -->
- Merge the local and travis kitchen tests into a single config [#8406](https://github.com/chef/chef/pull/8406) ([tas50](https://github.com/tas50)) <!-- 15.0.228 -->
- Replace kitchen-appbundle-updater in Travis tests with Test Kitchen lifecycle hooks [#8403](https://github.com/chef/chef/pull/8403) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 15.0.227 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index ed34f006a9..0f4379bcbb 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -27,11 +27,11 @@ GIT
PATH
remote: .
specs:
- chef (15.0.229)
+ chef (15.0.230)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
- chef-config (= 15.0.229)
+ chef-config (= 15.0.230)
chef-zero (>= 14.0.11)
diff-lcs (~> 1.2, >= 1.2.4)
ed25519 (~> 1.2)
@@ -55,11 +55,11 @@ PATH
syslog-logger (~> 1.6)
tty-screen (~> 0.6)
uuidtools (~> 2.1.5)
- chef (15.0.229-universal-mingw32)
+ chef (15.0.230-universal-mingw32)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
- chef-config (= 15.0.229)
+ chef-config (= 15.0.230)
chef-zero (>= 14.0.11)
diff-lcs (~> 1.2, >= 1.2.4)
ed25519 (~> 1.2)
@@ -99,7 +99,7 @@ PATH
PATH
remote: chef-config
specs:
- chef-config (15.0.229)
+ chef-config (15.0.230)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 4.0)
diff --git a/VERSION b/VERSION
index 3310db138c..95956f7ca4 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.0.229 \ No newline at end of file
+15.0.230 \ No newline at end of file
diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb
index 71f5c82e0a..a117629492 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.229".freeze
+ VERSION = "15.0.230".freeze
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 1a5e36da77..3c5dd5955e 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.229")
+ VERSION = Chef::VersionString.new("15.0.230")
end
#