summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <expeditor@chef.io>2020-07-15 19:23:08 +0000
committerChef Expeditor <expeditor@chef.io>2020-07-15 19:23:08 +0000
commitf681ac8e2a96c9f4ba38905054623315f625403b (patch)
treedd6a17dbec380288a4ae320a6a5d1e6167427942
parent16427887c6d2b46fd1e2b56b44436768ba10d700 (diff)
downloadchef-f681ac8e2a96c9f4ba38905054623315f625403b.tar.gz
Bump version to 15.13.2 by Chef Expeditorv15.13.2
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 31ae0380f3..09ec53ac0a 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.1 -->
-## [v15.13.1](https://github.com/chef/chef/tree/v15.13.1) (2020-07-15)
+<!-- latest_release 15.13.2 -->
+## [v15.13.2](https://github.com/chef/chef/tree/v15.13.2) (2020-07-15)
#### Merged Pull Requests
-- Fix warning message for cb / core resource conflict [#10165](https://github.com/chef/chef/pull/10165) ([tas50](https://github.com/tas50))
+- Allow iso8601 gem version 0.13 &amp; bump all deps [#10166](https://github.com/chef/chef/pull/10166) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup since=15.12.22 -->
### Changes not yet released to stable
#### Merged Pull Requests
+- Allow iso8601 gem version 0.13 &amp; bump all deps [#10166](https://github.com/chef/chef/pull/10166) ([tas50](https://github.com/tas50)) <!-- 15.13.2 -->
- Fix warning message for cb / core resource conflict [#10165](https://github.com/chef/chef/pull/10165) ([tas50](https://github.com/tas50)) <!-- 15.13.1 -->
- Support legacy DSS host keys with knife-ssh [#10164](https://github.com/chef/chef/pull/10164) ([tas50](https://github.com/tas50)) <!-- 15.13.0 -->
- Implement ENFORCE_LICENSE dist constant for knife bootstrap [#10116](https://github.com/chef/chef/pull/10116) ([ramereth](https://github.com/ramereth)) <!-- 15.12.24 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 615c0b1272..b25da173d5 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -27,12 +27,12 @@ GIT
PATH
remote: .
specs:
- chef (15.13.1)
+ chef (15.13.2)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
- chef-config (= 15.13.1)
- chef-utils (= 15.13.1)
+ chef-config (= 15.13.2)
+ chef-utils (= 15.13.2)
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.1-universal-mingw32)
+ chef (15.13.2-universal-mingw32)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
- chef-config (= 15.13.1)
- chef-utils (= 15.13.1)
+ chef-config (= 15.13.2)
+ chef-utils (= 15.13.2)
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.1)
- chef (= 15.13.1)
+ chef-bin (15.13.2)
+ chef (= 15.13.2)
PATH
remote: chef-config
specs:
- chef-config (15.13.1)
+ chef-config (15.13.2)
addressable
- chef-utils (= 15.13.1)
+ chef-utils (= 15.13.2)
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.1)
+ chef-utils (15.13.2)
GEM
remote: https://rubygems.org/
diff --git a/VERSION b/VERSION
index 53bb43e072..5cdba9f957 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.13.1 \ No newline at end of file
+15.13.2 \ 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 176c427568..0ba338018f 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.13.1".freeze
+ VERSION = "15.13.2".freeze
end
#
diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb
index 2b550e4d8f..de1ee8c0f3 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.13.1".freeze
+ VERSION = "15.13.2".freeze
end
diff --git a/chef-utils/lib/chef-utils/version.rb b/chef-utils/lib/chef-utils/version.rb
index 7b1fef9ca0..a760c45a04 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.13.1".freeze
+ VERSION = "15.13.2".freeze
end
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 69a35c75e0..55ad93be3f 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.13.1")
+ VERSION = Chef::VersionString.new("15.13.2")
end
#