summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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 37788fa57c..11e7cef94e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 16.5.45 -->
-## [v16.5.45](https://github.com/chef/chef/tree/v16.5.45) (2020-09-09)
+<!-- latest_release 16.5.46 -->
+## [v16.5.46](https://github.com/chef/chef/tree/v16.5.46) (2020-09-10)
#### Merged Pull Requests
-- Allow cpu_quota values &gt; 100 [#10408](https://github.com/chef/chef/pull/10408) ([tas50](https://github.com/tas50))
+- Use __dir__ instead of getting the dir of __FILE__ [#10401](https://github.com/chef/chef/pull/10401) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup since=16.4.41 -->
### Changes not yet released to stable
#### Merged Pull Requests
+- Use __dir__ instead of getting the dir of __FILE__ [#10401](https://github.com/chef/chef/pull/10401) ([tas50](https://github.com/tas50)) <!-- 16.5.46 -->
- Allow cpu_quota values &gt; 100 [#10408](https://github.com/chef/chef/pull/10408) ([tas50](https://github.com/tas50)) <!-- 16.5.45 -->
- Allow for license-acceptance 2.0 gem [#10406](https://github.com/chef/chef/pull/10406) ([tas50](https://github.com/tas50)) <!-- 16.5.44 -->
- Enable s390x RHEL8 and SLES15 platforms [#10376](https://github.com/chef/chef/pull/10376) ([jaymalasinha](https://github.com/jaymalasinha)) <!-- 16.5.43 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 634d274726..4c7eeb9147 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -27,12 +27,12 @@ GIT
PATH
remote: .
specs:
- chef (16.5.45)
+ chef (16.5.46)
addressable
bcrypt_pbkdf (= 1.1.0.rc1)
bundler (>= 1.10)
- chef-config (= 16.5.45)
- chef-utils (= 16.5.45)
+ chef-config (= 16.5.46)
+ chef-utils (= 16.5.46)
chef-vault
chef-zero (>= 14.0.11)
diff-lcs (>= 1.2.4, < 1.4.0)
@@ -63,12 +63,12 @@ PATH
tty-screen (~> 0.6)
tty-table (~> 0.11.0)
uuidtools (~> 2.1.5)
- chef (16.5.45-universal-mingw32)
+ chef (16.5.46-universal-mingw32)
addressable
bcrypt_pbkdf (= 1.1.0.rc1)
bundler (>= 1.10)
- chef-config (= 16.5.45)
- chef-utils (= 16.5.45)
+ chef-config (= 16.5.46)
+ chef-utils (= 16.5.46)
chef-vault
chef-zero (>= 14.0.11)
diff-lcs (>= 1.2.4, < 1.4.0)
@@ -114,15 +114,15 @@ PATH
PATH
remote: chef-bin
specs:
- chef-bin (16.5.45)
- chef (= 16.5.45)
+ chef-bin (16.5.46)
+ chef (= 16.5.46)
PATH
remote: chef-config
specs:
- chef-config (16.5.45)
+ chef-config (16.5.46)
addressable
- chef-utils (= 16.5.45)
+ chef-utils (= 16.5.46)
fuzzyurl
mixlib-config (>= 2.2.12, < 4.0)
mixlib-shellout (>= 2.0, < 4.0)
@@ -131,7 +131,7 @@ PATH
PATH
remote: chef-utils
specs:
- chef-utils (16.5.45)
+ chef-utils (16.5.46)
GEM
remote: https://rubygems.org/
diff --git a/VERSION b/VERSION
index 2a2bc718ae..e86311230e 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-16.5.45 \ No newline at end of file
+16.5.46 \ 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 dfbe0b6b11..b58fbad7ed 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("..", __dir__)
- VERSION = "16.5.45".freeze
+ VERSION = "16.5.46".freeze
end
#
diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb
index ba1c8c948b..71eb9b4452 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("..", __dir__)
- VERSION = "16.5.45".freeze
+ VERSION = "16.5.46".freeze
end
diff --git a/chef-utils/lib/chef-utils/version.rb b/chef-utils/lib/chef-utils/version.rb
index 8652b10028..d1d0a106c0 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("..", __dir__)
- VERSION = "16.5.45".freeze
+ VERSION = "16.5.46".freeze
end
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index ef03662140..1535b21793 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("..", __dir__)
- VERSION = Chef::VersionString.new("16.5.45")
+ VERSION = Chef::VersionString.new("16.5.46")
end
#