summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <chef-ci@chef.io>2019-04-19 19:54:34 +0000
committerChef Expeditor <chef-ci@chef.io>2019-04-19 19:54:34 +0000
commitc245adc26711abe4d4bb24d37b08e8ee652d17f6 (patch)
treea917f4c486df690c03630588855408105d876371
parent76ac64592cdc7a493e8ab00838faee6fc5139dc2 (diff)
downloadchef-c245adc26711abe4d4bb24d37b08e8ee652d17f6.tar.gz
Bump version to 15.0.225 by Chef Expeditorv15.0.225
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 539fddd96d..b743d22f0e 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.224 -->
-## [v15.0.224](https://github.com/chef/chef/tree/v15.0.224) (2019-04-19)
+<!-- latest_release 15.0.225 -->
+## [v15.0.225](https://github.com/chef/chef/tree/v15.0.225) (2019-04-19)
#### Merged Pull Requests
-- fix default/override attribute blacklists and whitelists [#8396](https://github.com/chef/chef/pull/8396) ([lamont-granquist](https://github.com/lamont-granquist))
+- 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))
<!-- latest_release -->
<!-- release_rollup -->
### Changes since latest stable release
#### 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)) <!-- 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 -->
- Sync the CLI option descriptions between chef-client and chef-solo [#8391](https://github.com/chef/chef/pull/8391) ([tas50](https://github.com/tas50)) <!-- 15.0.222 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 4527a89eeb..cdf2cd3c6a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -73,11 +73,11 @@ GIT
PATH
remote: .
specs:
- chef (15.0.224)
+ chef (15.0.225)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
- chef-config (= 15.0.224)
+ chef-config (= 15.0.225)
chef-zero (>= 14.0.11)
diff-lcs (~> 1.2, >= 1.2.4)
ed25519 (~> 1.2)
@@ -101,11 +101,11 @@ PATH
syslog-logger (~> 1.6)
tty-screen (~> 0.6)
uuidtools (~> 2.1.5)
- chef (15.0.224-universal-mingw32)
+ chef (15.0.225-universal-mingw32)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
- chef-config (= 15.0.224)
+ chef-config (= 15.0.225)
chef-zero (>= 14.0.11)
diff-lcs (~> 1.2, >= 1.2.4)
ed25519 (~> 1.2)
@@ -145,7 +145,7 @@ PATH
PATH
remote: chef-config
specs:
- chef-config (15.0.224)
+ chef-config (15.0.225)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 4.0)
diff --git a/VERSION b/VERSION
index 2ab97c0d4a..495fc29837 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.0.224 \ No newline at end of file
+15.0.225 \ 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 99f9547ce5..f85184a71f 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.224".freeze
+ VERSION = "15.0.225".freeze
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index c4b11d03aa..8798c59a01 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.224")
+ VERSION = Chef::VersionString.new("15.0.225")
end
#