summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <chef-ci@chef.io>2019-04-22 19:55:03 +0000
committerChef Expeditor <chef-ci@chef.io>2019-04-22 19:55:03 +0000
commitd53fff5b2d5f3998aac556c49b9d3092326197a1 (patch)
tree3a72b00ccb0254ddf47ce3677776c28f4b179a2a
parenta184b5669ac257f11fa6900ad64388e028d2d365 (diff)
downloadchef-d53fff5b2d5f3998aac556c49b9d3092326197a1.tar.gz
Bump version to 15.0.229 by Chef Expeditorv15.0.229
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 146d73046a..0cc960d650 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.228 -->
-## [v15.0.228](https://github.com/chef/chef/tree/v15.0.228) (2019-04-22)
+<!-- latest_release 15.0.229 -->
+## [v15.0.229](https://github.com/chef/chef/tree/v15.0.229) (2019-04-22)
#### Merged Pull Requests
-- Merge the local and travis kitchen tests into a single config [#8406](https://github.com/chef/chef/pull/8406) ([tas50](https://github.com/tas50))
+- Switch to inspec/train from gems [#8407](https://github.com/chef/chef/pull/8407) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup -->
### Changes since latest stable release
#### Merged Pull Requests
+- 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 -->
- Triggering expeditor version bump [#8405](https://github.com/chef/chef/pull/8405) ([marcparadise](https://github.com/marcparadise)) <!-- 15.0.226 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index ea1854b5f1..ed34f006a9 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -27,11 +27,11 @@ GIT
PATH
remote: .
specs:
- chef (15.0.228)
+ chef (15.0.229)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
- chef-config (= 15.0.228)
+ chef-config (= 15.0.229)
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.228-universal-mingw32)
+ chef (15.0.229-universal-mingw32)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
- chef-config (= 15.0.228)
+ chef-config (= 15.0.229)
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.228)
+ chef-config (15.0.229)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 4.0)
diff --git a/VERSION b/VERSION
index 8871aee2d0..3310db138c 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.0.228 \ No newline at end of file
+15.0.229 \ 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 809b190a4f..71f5c82e0a 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.228".freeze
+ VERSION = "15.0.229".freeze
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index f445c25ccf..1a5e36da77 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.228")
+ VERSION = Chef::VersionString.new("15.0.229")
end
#