summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <chef-ci@chef.io>2020-08-18 04:48:05 +0000
committerChef Expeditor <chef-ci@chef.io>2020-08-18 04:48:12 +0000
commit5cc241bb14e845ff581082bdcd6302fc37d51bda (patch)
tree838be8456d5f85721b08e542a29ea5ae47665751
parent67e25ff14106283dc95797cf2730619364b877e5 (diff)
downloadchef-15.13.12.tar.gz
Bump version to 15.13.12 by Chef Expeditorv15.13.12
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 a0931a8d60..ed5083f53d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 15.13.11 -->
-## [v15.13.11](https://github.com/chef/chef/tree/v15.13.11) (2020-08-18)
+<!-- latest_release 15.13.12 -->
+## [v15.13.12](https://github.com/chef/chef/tree/v15.13.12) (2020-08-18)
#### Merged Pull Requests
-- Use net/http and openssl instead of net/https [#10314](https://github.com/chef/chef/pull/10314) ([tas50](https://github.com/tas50))
+- Make sure darwin is always detected [#10313](https://github.com/chef/chef/pull/10313) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup since=15.13.8 -->
### Changes not yet released to stable
#### Merged Pull Requests
+- Make sure darwin is always detected [#10313](https://github.com/chef/chef/pull/10313) ([tas50](https://github.com/tas50)) <!-- 15.13.12 -->
- Use net/http and openssl instead of net/https [#10314](https://github.com/chef/chef/pull/10314) ([tas50](https://github.com/tas50)) <!-- 15.13.11 -->
- Update all deps to current [#10311](https://github.com/chef/chef/pull/10311) ([tas50](https://github.com/tas50)) <!-- 15.13.10 -->
- Backport dist configuration to chef15 [#10266](https://github.com/chef/chef/pull/10266) ([tehlers320](https://github.com/tehlers320)) <!-- 15.13.9 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index cac352cbdd..5e2de2d32e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -27,12 +27,12 @@ GIT
PATH
remote: .
specs:
- chef (15.13.11)
+ chef (15.13.12)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
- chef-config (= 15.13.11)
- chef-utils (= 15.13.11)
+ chef-config (= 15.13.12)
+ chef-utils (= 15.13.12)
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.13.11-universal-mingw32)
+ chef (15.13.12-universal-mingw32)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
- chef-config (= 15.13.11)
- chef-utils (= 15.13.11)
+ chef-config (= 15.13.12)
+ chef-utils (= 15.13.12)
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.13.11)
- chef (= 15.13.11)
+ chef-bin (15.13.12)
+ chef (= 15.13.12)
PATH
remote: chef-config
specs:
- chef-config (15.13.11)
+ chef-config (15.13.12)
addressable
- chef-utils (= 15.13.11)
+ chef-utils (= 15.13.12)
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.13.11)
+ chef-utils (15.13.12)
GEM
remote: https://rubygems.org/
diff --git a/VERSION b/VERSION
index ad24328698..fb7be033bc 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.13.11 \ No newline at end of file
+15.13.12 \ 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 da9a635bad..9fe256fef5 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 = "15.13.11".freeze
+ VERSION = "15.13.12".freeze
end
#
diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb
index 1c6019732f..33c3a0b83a 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 = "15.13.11".freeze
+ VERSION = "15.13.12".freeze
end
diff --git a/chef-utils/lib/chef-utils/version.rb b/chef-utils/lib/chef-utils/version.rb
index e517729b4a..abcfb30926 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 = "15.13.11".freeze
+ VERSION = "15.13.12".freeze
end
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index f674bb93e2..8fd8fa78fa 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("15.13.11")
+ VERSION = Chef::VersionString.new("15.13.12")
end
#