summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <expeditor@chef.io>2020-05-04 17:13:24 +0000
committerChef Expeditor <expeditor@chef.io>2020-05-04 17:13:24 +0000
commite57ea06ca1d0cb0314b4c3b9b170f87e6cb33666 (patch)
tree52d099ad425a5ad813af51b8ee18e32b3a7cc5b4
parentbedccf12d841820fa08e970edc75ce7e151b05d7 (diff)
downloadchef-e57ea06ca1d0cb0314b4c3b9b170f87e6cb33666.tar.gz
Bump version to 16.0.269 by Chef Expeditorv16.0.269
Obvious fix; these changes are the result of automation not creative thinking.
-rw-r--r--CHANGELOG.md7
-rw-r--r--Gemfile.lock22
-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--chef-utils/lib/chef-utils/version.rb2
-rw-r--r--lib/chef/version.rb2
7 files changed, 20 insertions, 19 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e9c497e098..d35773fdc2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 16.0.268 -->
-## [v16.0.268](https://github.com/chef/chef/tree/v16.0.268) (2020-05-04)
+<!-- latest_release 16.0.269 -->
+## [v16.0.269](https://github.com/chef/chef/tree/v16.0.269) (2020-05-04)
#### Merged Pull Requests
-- chef_client_cron: cleanup the appropriate cron job [#9784](https://github.com/chef/chef/pull/9784) ([tas50](https://github.com/tas50))
+- Avoid setting package to macports and then overriding to homebrew [#9783](https://github.com/chef/chef/pull/9783) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup since=16.0.257 -->
### Changes not yet released to stable
#### Merged Pull Requests
+- Avoid setting package to macports and then overriding to homebrew [#9783](https://github.com/chef/chef/pull/9783) ([tas50](https://github.com/tas50)) <!-- 16.0.269 -->
- chef_client_cron: cleanup the appropriate cron job [#9784](https://github.com/chef/chef/pull/9784) ([tas50](https://github.com/tas50)) <!-- 16.0.268 -->
- Modified client cron directory permission [#9782](https://github.com/chef/chef/pull/9782) ([DhaneshRaghavan](https://github.com/DhaneshRaghavan)) <!-- 16.0.267 -->
- Fix symbols and arrays in yaml conversion tool [#9769](https://github.com/chef/chef/pull/9769) ([phiggins](https://github.com/phiggins)) <!-- 16.0.266 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index d46ca501c5..6d34e34519 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -27,12 +27,12 @@ GIT
PATH
remote: .
specs:
- chef (16.0.268)
+ chef (16.0.269)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
- chef-config (= 16.0.268)
- chef-utils (= 16.0.268)
+ chef-config (= 16.0.269)
+ chef-utils (= 16.0.269)
chef-vault
chef-zero (>= 14.0.11)
diff-lcs (~> 1.2, >= 1.2.4)
@@ -61,12 +61,12 @@ PATH
train-winrm (>= 0.2.5)
tty-screen (~> 0.6)
uuidtools (~> 2.1.5)
- chef (16.0.268-universal-mingw32)
+ chef (16.0.269-universal-mingw32)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
- chef-config (= 16.0.268)
- chef-utils (= 16.0.268)
+ chef-config (= 16.0.269)
+ chef-utils (= 16.0.269)
chef-vault
chef-zero (>= 14.0.11)
diff-lcs (~> 1.2, >= 1.2.4)
@@ -111,15 +111,15 @@ PATH
PATH
remote: chef-bin
specs:
- chef-bin (16.0.268)
- chef (= 16.0.268)
+ chef-bin (16.0.269)
+ chef (= 16.0.269)
PATH
remote: chef-config
specs:
- chef-config (16.0.268)
+ chef-config (16.0.269)
addressable
- chef-utils (= 16.0.268)
+ chef-utils (= 16.0.269)
fuzzyurl
mixlib-config (>= 2.2.12, < 4.0)
mixlib-shellout (>= 2.0, < 4.0)
@@ -128,7 +128,7 @@ PATH
PATH
remote: chef-utils
specs:
- chef-utils (16.0.268)
+ chef-utils (16.0.269)
GEM
remote: https://rubygems.org/
diff --git a/VERSION b/VERSION
index 505c41c5c6..9c53162f34 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-16.0.268 \ No newline at end of file
+16.0.269 \ 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 a42a4dc462..757046049f 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 = "16.0.268".freeze
+ VERSION = "16.0.269".freeze
end
#
diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb
index a0a37abc85..c9ce654466 100644
--- a/chef-config/lib/chef-config/version.rb
+++ b/chef-config/lib/chef-config/version.rb
@@ -15,5 +15,5 @@
module ChefConfig
CHEFCONFIG_ROOT = File.expand_path("../..", __FILE__)
- VERSION = "16.0.268".freeze
+ VERSION = "16.0.269".freeze
end
diff --git a/chef-utils/lib/chef-utils/version.rb b/chef-utils/lib/chef-utils/version.rb
index c9a5eab1f3..4ce8505490 100644
--- a/chef-utils/lib/chef-utils/version.rb
+++ b/chef-utils/lib/chef-utils/version.rb
@@ -15,5 +15,5 @@
module ChefUtils
CHEFUTILS_ROOT = File.expand_path("../..", __FILE__)
- VERSION = "16.0.268".freeze
+ VERSION = "16.0.269".freeze
end
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index e0b428ce9b..caf58e8d51 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("16.0.268")
+ VERSION = Chef::VersionString.new("16.0.269")
end
#