summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <expeditor@chef.io>2020-05-22 16:50:07 +0000
committerChef Expeditor <expeditor@chef.io>2020-05-22 16:50:07 +0000
commit18e3d8f83a1cc1f2c4ce055d3c7079397b607439 (patch)
tree0ee39b9ab22d5ef397a76c66c990bebf4c44bdfb
parent134b0a4356de729c8455977f47812de969ec802e (diff)
downloadchef-18e3d8f83a1cc1f2c4ce055d3c7079397b607439.tar.gz
Bump version to 15.11.3 by Chef Expeditorv15.11.3
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 95c21114d3..0a2ab44da7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 15.11.2 -->
-## [v15.11.2](https://github.com/chef/chef/tree/v15.11.2) (2020-05-22)
+<!-- latest_release 15.11.3 -->
+## [v15.11.3](https://github.com/chef/chef/tree/v15.11.3) (2020-05-22)
#### Merged Pull Requests
-- Modify verify pipeline to use rubydistros windows-2019 docker image [#9881](https://github.com/chef/chef/pull/9881) ([christopher-snapp](https://github.com/christopher-snapp))
+- Multiple backports from Chef 16 [#9904](https://github.com/chef/chef/pull/9904) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup since=15.10.12 -->
### Changes not yet released to stable
#### Merged Pull Requests
+- Multiple backports from Chef 16 [#9904](https://github.com/chef/chef/pull/9904) ([tas50](https://github.com/tas50)) <!-- 15.11.3 -->
- Modify verify pipeline to use rubydistros windows-2019 docker image [#9881](https://github.com/chef/chef/pull/9881) ([christopher-snapp](https://github.com/christopher-snapp)) <!-- 15.11.2 -->
- Update openssl to 1.0.2v [#9902](https://github.com/chef/chef/pull/9902) ([tas50](https://github.com/tas50)) <!-- 15.11.1 -->
- Update all deps to current [#9899](https://github.com/chef/chef/pull/9899) ([tas50](https://github.com/tas50)) <!-- 15.11.0 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index d804cf6ec4..5ae6a24110 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -27,12 +27,12 @@ GIT
PATH
remote: .
specs:
- chef (15.11.2)
+ chef (15.11.3)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
- chef-config (= 15.11.2)
- chef-utils (= 15.11.2)
+ chef-config (= 15.11.3)
+ chef-utils (= 15.11.3)
chef-zero (>= 14.0.11)
diff-lcs (~> 1.2, >= 1.2.4)
ed25519 (~> 1.2)
@@ -59,12 +59,12 @@ PATH
train-winrm (>= 0.2.5)
tty-screen (~> 0.6)
uuidtools (~> 2.1.5)
- chef (15.11.2-universal-mingw32)
+ chef (15.11.3-universal-mingw32)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
- chef-config (= 15.11.2)
- chef-utils (= 15.11.2)
+ chef-config (= 15.11.3)
+ chef-utils (= 15.11.3)
chef-zero (>= 14.0.11)
diff-lcs (~> 1.2, >= 1.2.4)
ed25519 (~> 1.2)
@@ -107,15 +107,15 @@ PATH
PATH
remote: chef-bin
specs:
- chef-bin (15.11.2)
- chef (= 15.11.2)
+ chef-bin (15.11.3)
+ chef (= 15.11.3)
PATH
remote: chef-config
specs:
- chef-config (15.11.2)
+ chef-config (15.11.3)
addressable
- chef-utils (= 15.11.2)
+ chef-utils (= 15.11.3)
fuzzyurl
mixlib-config (>= 2.2.12, < 4.0)
mixlib-shellout (>= 2.0, < 4.0)
@@ -124,7 +124,7 @@ PATH
PATH
remote: chef-utils
specs:
- chef-utils (15.11.2)
+ chef-utils (15.11.3)
GEM
remote: https://rubygems.org/
diff --git a/VERSION b/VERSION
index 5635cb5c26..66cea48e54 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.11.2 \ No newline at end of file
+15.11.3 \ 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 ce39797b0f..08ceca062c 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.11.2".freeze
+ VERSION = "15.11.3".freeze
end
#
diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb
index ad96b129f9..206ead210d 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 = "15.11.2".freeze
+ VERSION = "15.11.3".freeze
end
diff --git a/chef-utils/lib/chef-utils/version.rb b/chef-utils/lib/chef-utils/version.rb
index 028aec67ac..c349face55 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 = "15.11.2".freeze
+ VERSION = "15.11.3".freeze
end
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 3a326c11cf..e029fdb7e4 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.11.2")
+ VERSION = Chef::VersionString.new("15.11.3")
end
#