summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <chef-ci@chef.io>2019-08-07 23:30:58 +0000
committerChef Expeditor <chef-ci@chef.io>2019-08-07 23:30:58 +0000
commita3f7490ce3aefc12e89894f2378b8775b0c08d09 (patch)
treefb6f9a6e045dbb8f446db54fe991f47d8d777421
parent339e94c85d0cbc6a9e11e5a79f1843ea5bbea0d0 (diff)
downloadchef-a3f7490ce3aefc12e89894f2378b8775b0c08d09.tar.gz
Bump version to 15.2.18 by Chef Expeditorv15.2.18
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 457ed1f546..20cf7ca871 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 15.2.17 -->
-## [v15.2.17](https://github.com/chef/chef/tree/v15.2.17) (2019-08-07)
+<!-- latest_release 15.2.18 -->
+## [v15.2.18](https://github.com/chef/chef/tree/v15.2.18) (2019-08-07)
#### Merged Pull Requests
-- Chef-15: Make temp dir using mkdir instead of mktemp [#8795](https://github.com/chef/chef/pull/8795) ([vsingh-msys](https://github.com/vsingh-msys))
+- Property: Reorder comparison with NOT_PASSED. [#8781](https://github.com/chef/chef/pull/8781) ([ab](https://github.com/ab))
<!-- latest_release -->
<!-- release_rollup since=15.1.36 -->
### Changes not yet released to stable
#### Merged Pull Requests
+- Property: Reorder comparison with NOT_PASSED. [#8781](https://github.com/chef/chef/pull/8781) ([ab](https://github.com/ab)) <!-- 15.2.18 -->
- Chef-15: Make temp dir using mkdir instead of mktemp [#8795](https://github.com/chef/chef/pull/8795) ([vsingh-msys](https://github.com/vsingh-msys)) <!-- 15.2.17 -->
- fix knife node environment set output [#8772](https://github.com/chef/chef/pull/8772) ([dheerajd-msys](https://github.com/dheerajd-msys)) <!-- 15.2.16 -->
- Fix for rhsm_repo disable does not support wildcard [#8794](https://github.com/chef/chef/pull/8794) ([kapilchouhan99](https://github.com/kapilchouhan99)) <!-- 15.2.15 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 7b7cb28fde..3f9fde74c8 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -27,11 +27,11 @@ GIT
PATH
remote: .
specs:
- chef (15.2.17)
+ chef (15.2.18)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
- chef-config (= 15.2.17)
+ chef-config (= 15.2.18)
chef-zero (>= 14.0.11)
diff-lcs (~> 1.2, >= 1.2.4)
ed25519 (~> 1.2)
@@ -57,11 +57,11 @@ PATH
train-core (~> 2.0, >= 2.0.12)
tty-screen (~> 0.6)
uuidtools (~> 2.1.5)
- chef (15.2.17-universal-mingw32)
+ chef (15.2.18-universal-mingw32)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
- chef-config (= 15.2.17)
+ chef-config (= 15.2.18)
chef-zero (>= 14.0.11)
diff-lcs (~> 1.2, >= 1.2.4)
ed25519 (~> 1.2)
@@ -103,13 +103,13 @@ PATH
PATH
remote: chef-bin
specs:
- chef-bin (15.2.17)
- chef (= 15.2.17)
+ chef-bin (15.2.18)
+ chef (= 15.2.18)
PATH
remote: chef-config
specs:
- chef-config (15.2.17)
+ chef-config (15.2.18)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 4.0)
diff --git a/VERSION b/VERSION
index e69bd5967a..678b3f718b 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.2.17 \ No newline at end of file
+15.2.18 \ 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 4ac859169e..1428638db3 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.2.17".freeze
+ VERSION = "15.2.18".freeze
end
#
diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb
index 496ada60f1..220a5bd5f5 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.2.17".freeze
+ VERSION = "15.2.18".freeze
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 5fb4df5999..59c1da30f2 100644
--- a/lib/chef/version.rb
+++ b/lib/chef/version.rb
@@ -23,7 +23,7 @@ require_relative "version_string"
class Chef
CHEF_ROOT = File.expand_path("../..", __FILE__)
- VERSION = Chef::VersionString.new("15.2.17")
+ VERSION = Chef::VersionString.new("15.2.18")
end
#