summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <expeditor@chef.io>2020-04-04 01:32:48 +0000
committerChef Expeditor <expeditor@chef.io>2020-04-04 01:32:48 +0000
commit47ca299f03b9cc5f0ab3d12bb345546ddfb689b8 (patch)
tree83ef8b48645edb2531d194d1482c6a724d653848
parent04753562ddc9c11dca4e67f4509f0929954268f6 (diff)
downloadchef-47ca299f03b9cc5f0ab3d12bb345546ddfb689b8.tar.gz
Bump version to 14.14.46 by Chef Expeditorv14.14.46
Obvious fix; these changes are the result of automation not creative thinking.
-rw-r--r--CHANGELOG.md7
-rw-r--r--Gemfile.lock10
-rw-r--r--VERSION2
-rw-r--r--chef-config/lib/chef-config/version.rb2
-rw-r--r--lib/chef/version.rb2
5 files changed, 12 insertions, 11 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index ce7de2f40e..4720266b3d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 14.14.45 -->
-## [v14.14.45](https://github.com/chef/chef/tree/v14.14.45) (2020-04-04)
+<!-- latest_release 14.14.46 -->
+## [v14.14.46](https://github.com/chef/chef/tree/v14.14.46) (2020-04-04)
#### Merged Pull Requests
-- Pin omnibus-software before the change that breaks Ruby &lt; 2.6 [#9594](https://github.com/chef/chef/pull/9594) ([btm](https://github.com/btm))
+- Fix macos signing key [#9595](https://github.com/chef/chef/pull/9595) ([btm](https://github.com/btm))
<!-- latest_release -->
<!-- release_rollup since=14.14.29 -->
### Changes not yet released to stable
#### Merged Pull Requests
+- Fix macos signing key [#9595](https://github.com/chef/chef/pull/9595) ([btm](https://github.com/btm)) <!-- 14.14.46 -->
- Pin omnibus-software before the change that breaks Ruby &lt; 2.6 [#9594](https://github.com/chef/chef/pull/9594) ([btm](https://github.com/btm)) <!-- 14.14.45 -->
- 14: Conservative bump of omnibus/Gemfile [#9589](https://github.com/chef/chef/pull/9589) ([btm](https://github.com/btm)) <!-- 14.14.44 -->
- Remove S390x EL6 tester [#9582](https://github.com/chef/chef/pull/9582) ([tas50](https://github.com/tas50)) <!-- 14.14.43 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index f50370688b..0e4c606120 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,10 +1,10 @@
PATH
remote: .
specs:
- chef (14.14.45)
+ chef (14.14.46)
addressable
bundler (>= 1.10)
- chef-config (= 14.14.45)
+ chef-config (= 14.14.46)
chef-zero (>= 13.0, < 15.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -31,10 +31,10 @@ PATH
specinfra (~> 2.10)
syslog-logger (~> 1.6)
uuidtools (~> 2.1.5)
- chef (14.14.45-universal-mingw32)
+ chef (14.14.46-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 14.14.45)
+ chef-config (= 14.14.46)
chef-zero (>= 13.0, < 15.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -77,7 +77,7 @@ PATH
PATH
remote: chef-config
specs:
- chef-config (14.14.45)
+ chef-config (14.14.46)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 4.0)
diff --git a/VERSION b/VERSION
index 367c133acf..9351b2ba33 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.14.45 \ No newline at end of file
+14.14.46 \ No newline at end of file
diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb
index 4a3ea31096..be8e658521 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 = "14.14.45".freeze
+ VERSION = "14.14.46".freeze
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 73f63e9cb2..506690525a 100644
--- a/lib/chef/version.rb
+++ b/lib/chef/version.rb
@@ -23,7 +23,7 @@ require "chef/version_string"
class Chef
CHEF_ROOT = File.expand_path("../..", __FILE__)
- VERSION = Chef::VersionString.new("14.14.45")
+ VERSION = Chef::VersionString.new("14.14.46")
end
#