summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <chef-ci@chef.io>2019-06-19 17:20:07 +0000
committerChef Expeditor <chef-ci@chef.io>2019-06-19 17:20:07 +0000
commit9a6f1cc957448961d12d7cc0b24df024195f0fb3 (patch)
tree2fa8af9bf94dea2742d48f336cb5a3ed87947d5b
parent956d5667568e2be1a42c66e221f4651174121d52 (diff)
downloadchef-9a6f1cc957448961d12d7cc0b24df024195f0fb3.tar.gz
Bump version to 15.1.16 by Chef Expeditorv15.1.16
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 aee0f1e923..7a36a602a1 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.15 -->
-## [v15.1.15](https://github.com/chef/chef/tree/v15.1.15) (2019-06-18)
+<!-- latest_release 15.1.16 -->
+## [v15.1.16](https://github.com/chef/chef/tree/v15.1.16) (2019-06-19)
#### Merged Pull Requests
-- Bump inspec to 4.6.3 [#8666](https://github.com/chef/chef/pull/8666) ([chef-ci](https://github.com/chef-ci))
+- Move the data collector should_be_enabled? check [#8670](https://github.com/chef/chef/pull/8670) ([lamont-granquist](https://github.com/lamont-granquist))
<!-- latest_release -->
<!-- release_rollup since=15.0.300 -->
### Changes not yet released to rubygems.org
#### Merged Pull Requests
+- 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 -->
- Add Chef 12 updating docs [#8664](https://github.com/chef/chef/pull/8664) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 15.1.14 -->
- Update omnibus-software to unbreak chef builds [#8665](https://github.com/chef/chef/pull/8665) ([tas50](https://github.com/tas50)) <!-- 15.1.13 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index c3e7fb6d86..cbebc79ad5 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -27,11 +27,11 @@ GIT
PATH
remote: .
specs:
- chef (15.1.15)
+ chef (15.1.16)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
- chef-config (= 15.1.15)
+ chef-config (= 15.1.16)
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.15-universal-mingw32)
+ chef (15.1.16-universal-mingw32)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
- chef-config (= 15.1.15)
+ chef-config (= 15.1.16)
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.15)
- chef (= 15.1.15)
+ chef-bin (15.1.16)
+ chef (= 15.1.16)
PATH
remote: chef-config
specs:
- chef-config (15.1.15)
+ chef-config (15.1.16)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 4.0)
diff --git a/VERSION b/VERSION
index c128ed2b15..02668a4f63 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.1.15 \ No newline at end of file
+15.1.16 \ 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 dda72daf1a..494990d07f 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.15".freeze
+ VERSION = "15.1.16".freeze
end
#
diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb
index 1f36b53cf6..86d9501fea 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.15".freeze
+ VERSION = "15.1.16".freeze
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 1c01a3de22..d53fa1f2de 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.15")
+ VERSION = Chef::VersionString.new("15.1.16")
end
#