summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <chef-ci@chef.io>2019-06-20 07:39:26 +0000
committerChef Expeditor <chef-ci@chef.io>2019-06-20 07:39:26 +0000
commit66f9dcffa2bcf1d415344004f467dff4d668fda8 (patch)
treeb9ce96d2c7f9a570c2c4d0959c266e15526717dd
parent2c9209f42876daf4eb5d343f1cb0ea3fe47ca3e5 (diff)
downloadchef-66f9dcffa2bcf1d415344004f467dff4d668fda8.tar.gz
Bump version to 15.1.18 by Chef Expeditorv15.1.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 c0150e43b6..11ed04a8eb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 15.1.17 -->
-## [v15.1.17](https://github.com/chef/chef/tree/v15.1.17) (2019-06-20)
+<!-- latest_release 15.1.18 -->
+## [v15.1.18](https://github.com/chef/chef/tree/v15.1.18) (2019-06-20)
#### Merged Pull Requests
-- Bump inspec-core-bin to 4.6.4 [#8672](https://github.com/chef/chef/pull/8672) ([chef-ci](https://github.com/chef-ci))
+- added scaffolding-chef plan [#8659](https://github.com/chef/chef/pull/8659) ([echohack](https://github.com/echohack))
<!-- latest_release -->
<!-- release_rollup since=15.0.300 -->
### Changes not yet released to rubygems.org
#### Merged Pull Requests
+- added scaffolding-chef plan [#8659](https://github.com/chef/chef/pull/8659) ([echohack](https://github.com/echohack)) <!-- 15.1.18 -->
- Bump inspec-core-bin to 4.6.4 [#8672](https://github.com/chef/chef/pull/8672) ([chef-ci](https://github.com/chef-ci)) <!-- 15.1.17 -->
- Move the data collector should_be_enabled? check [#8670](https://github.com/chef/chef/pull/8670) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 15.1.16 -->
- Bump inspec to 4.6.3 [#8666](https://github.com/chef/chef/pull/8666) ([chef-ci](https://github.com/chef-ci)) <!-- 15.1.15 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index c92fee32f2..8b78210488 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -27,11 +27,11 @@ GIT
PATH
remote: .
specs:
- chef (15.1.17)
+ chef (15.1.18)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
- chef-config (= 15.1.17)
+ chef-config (= 15.1.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.1.17-universal-mingw32)
+ chef (15.1.18-universal-mingw32)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
- chef-config (= 15.1.17)
+ chef-config (= 15.1.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.1.17)
- chef (= 15.1.17)
+ chef-bin (15.1.18)
+ chef (= 15.1.18)
PATH
remote: chef-config
specs:
- chef-config (15.1.17)
+ chef-config (15.1.18)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 4.0)
diff --git a/VERSION b/VERSION
index a210262a46..4355e90509 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.1.17 \ No newline at end of file
+15.1.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 6452438548..3e12c76a56 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.1.17".freeze
+ VERSION = "15.1.18".freeze
end
#
diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb
index 365b42191c..49aa49b176 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.1.17".freeze
+ VERSION = "15.1.18".freeze
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index ed5e928725..1a3a9bcec1 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.1.17")
+ VERSION = Chef::VersionString.new("15.1.18")
end
#