summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <chef-ci@chef.io>2019-04-20 16:43:39 +0000
committerChef Expeditor <chef-ci@chef.io>2019-04-20 16:43:39 +0000
commit19268c5d5f611198a048d0b0bce756e378a88fb6 (patch)
tree4f539c3140823e41bd92a1da3643f12ad9ebd965
parenta579fc719853f14f2766e0748945a4305a9d2c4f (diff)
downloadchef-19268c5d5f611198a048d0b0bce756e378a88fb6.tar.gz
Bump version to 15.0.226 by Chef Expeditorv15.0.226
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 b743d22f0e..4f78b10f1a 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.225 -->
-## [v15.0.225](https://github.com/chef/chef/tree/v15.0.225) (2019-04-19)
+<!-- latest_release 15.0.226 -->
+## [v15.0.226](https://github.com/chef/chef/tree/v15.0.226) (2019-04-20)
#### Merged Pull Requests
-- Add ed25519 deps, bump highline and net-ssh pins and pull inspec from git [#8380](https://github.com/chef/chef/pull/8380) ([tas50](https://github.com/tas50))
+- Triggering expeditor version bump [#8405](https://github.com/chef/chef/pull/8405) ([marcparadise](https://github.com/marcparadise))
<!-- latest_release -->
<!-- release_rollup -->
### Changes since latest stable release
#### Merged Pull Requests
+- Triggering expeditor version bump [#8405](https://github.com/chef/chef/pull/8405) ([marcparadise](https://github.com/marcparadise)) <!-- 15.0.226 -->
- Add ed25519 deps, bump highline and net-ssh pins and pull inspec from git [#8380](https://github.com/chef/chef/pull/8380) ([tas50](https://github.com/tas50)) <!-- 15.0.225 -->
- fix default/override attribute blacklists and whitelists [#8396](https://github.com/chef/chef/pull/8396) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 15.0.224 -->
- Replace highline with tty-screen in knife list [#8381](https://github.com/chef/chef/pull/8381) ([tas50](https://github.com/tas50)) <!-- 15.0.223 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 6391354e48..bf42bd469a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -89,11 +89,11 @@ GIT
PATH
remote: .
specs:
- chef (15.0.225)
+ chef (15.0.226)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
- chef-config (= 15.0.225)
+ chef-config (= 15.0.226)
chef-zero (>= 14.0.11)
diff-lcs (~> 1.2, >= 1.2.4)
ed25519 (~> 1.2)
@@ -117,11 +117,11 @@ PATH
syslog-logger (~> 1.6)
tty-screen (~> 0.6)
uuidtools (~> 2.1.5)
- chef (15.0.225-universal-mingw32)
+ chef (15.0.226-universal-mingw32)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
- chef-config (= 15.0.225)
+ chef-config (= 15.0.226)
chef-zero (>= 14.0.11)
diff-lcs (~> 1.2, >= 1.2.4)
ed25519 (~> 1.2)
@@ -161,7 +161,7 @@ PATH
PATH
remote: chef-config
specs:
- chef-config (15.0.225)
+ chef-config (15.0.226)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 4.0)
diff --git a/VERSION b/VERSION
index 495fc29837..9994dd1d11 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.0.225 \ No newline at end of file
+15.0.226 \ 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 f85184a71f..5abf67642a 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.225".freeze
+ VERSION = "15.0.226".freeze
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 8798c59a01..0634f3952d 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.225")
+ VERSION = Chef::VersionString.new("15.0.226")
end
#