summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <chef-ci@chef.io>2020-11-17 22:06:06 +0000
committerChef Expeditor <chef-ci@chef.io>2020-11-17 22:06:06 +0000
commit866380de04c61aa1bddb0ab04d58e0178c864a4c (patch)
tree277327c58707dc19b5d2551b419fb5fcf53fe74b
parentc950eb1dd04df10f8ebc80f424fd39d948c3a1f9 (diff)
downloadchef-866380de04c61aa1bddb0ab04d58e0178c864a4c.tar.gz
Bump version to 15.14.1 by Chef Expeditorv15.14.1
Obvious fix; these changes are the result of automation not creative thinking.
-rw-r--r--CHANGELOG.md12
-rw-r--r--Gemfile.lock33
-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, 34 insertions, 21 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f6b4c60fbf..d3c277d02a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release -->
+<!-- latest_release 15.14.1 -->
+## [v15.14.1](https://github.com/chef/chef/tree/v15.14.1) (2020-11-17)
+
+#### Merged Pull Requests
+- Fix Chef-15 Habitat Builds [#10460](https://github.com/chef/chef/pull/10460) ([christopher-snapp](https://github.com/christopher-snapp))
<!-- latest_release -->
-<!-- release_rollup -->
+<!-- release_rollup since=15.14.0 -->
+### Changes not yet released to stable
+
+#### Merged Pull Requests
+- Fix Chef-15 Habitat Builds [#10460](https://github.com/chef/chef/pull/10460) ([christopher-snapp](https://github.com/christopher-snapp)) <!-- 15.14.1 -->
<!-- release_rollup -->
<!-- latest_stable_release -->
diff --git a/Gemfile.lock b/Gemfile.lock
index b061f9a659..63894dfe22 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -19,12 +19,12 @@ GIT
PATH
remote: .
specs:
- chef (15.14.0)
+ chef (15.14.1)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
- chef-config (= 15.14.0)
- chef-utils (= 15.14.0)
+ chef-config (= 15.14.1)
+ chef-utils (= 15.14.1)
chef-zero (>= 14.0.11)
diff-lcs (~> 1.2, >= 1.2.4)
ed25519 (~> 1.2)
@@ -51,12 +51,12 @@ PATH
train-winrm (>= 0.2.5)
tty-screen (~> 0.6)
uuidtools (~> 2.1.5)
- chef (15.14.0-universal-mingw32)
+ chef (15.14.1-universal-mingw32)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
- chef-config (= 15.14.0)
- chef-utils (= 15.14.0)
+ chef-config (= 15.14.1)
+ chef-utils (= 15.14.1)
chef-zero (>= 14.0.11)
diff-lcs (~> 1.2, >= 1.2.4)
ed25519 (~> 1.2)
@@ -99,15 +99,15 @@ PATH
PATH
remote: chef-bin
specs:
- chef-bin (15.14.0)
- chef (= 15.14.0)
+ chef-bin (15.14.1)
+ chef (= 15.14.1)
PATH
remote: chef-config
specs:
- chef-config (15.14.0)
+ chef-config (15.14.1)
addressable
- chef-utils (= 15.14.0)
+ chef-utils (= 15.14.1)
fuzzyurl
mixlib-config (>= 2.2.12, < 4.0)
mixlib-shellout (>= 2.0, < 4.0)
@@ -116,7 +116,7 @@ PATH
PATH
remote: chef-utils
specs:
- chef-utils (15.14.0)
+ chef-utils (15.14.1)
GEM
remote: https://rubygems.org/
@@ -160,7 +160,7 @@ GEM
regexp_parser (~> 1.2)
ed25519 (1.2.4)
equatable (0.6.1)
- erubi (1.9.0)
+ erubi (1.10.0)
erubis (2.7.0)
faraday (1.0.1)
multipart-post (>= 1.2, < 3)
@@ -343,8 +343,9 @@ GEM
mixlib-shellout (>= 2.0, < 4.0)
net-scp (>= 1.2, < 4.0)
net-ssh (>= 2.9, < 7.0)
- train-winrm (0.2.6)
+ train-winrm (0.2.11)
winrm (~> 2.0)
+ winrm-elevated (~> 1.2.2)
winrm-fs (~> 1.0)
tty-box (0.5.0)
pastel (~> 0.7.2)
@@ -399,7 +400,7 @@ GEM
win32-taskscheduler (2.0.4)
ffi
structured_warnings
- winrm (2.3.4)
+ winrm (2.3.5)
builder (>= 2.1.2)
erubi (~> 1.8)
gssapi (~> 1.2)
@@ -408,6 +409,10 @@ GEM
logging (>= 1.6.1, < 3.0)
nori (~> 2.0)
rubyntlm (~> 0.6.0, >= 0.6.1)
+ winrm-elevated (1.2.3)
+ erubi (~> 1.8)
+ winrm (~> 2.0)
+ winrm-fs (~> 1.0)
winrm-fs (1.3.3)
erubi (~> 1.8)
logging (>= 1.6.1, < 3.0)
diff --git a/VERSION b/VERSION
index f4b39dcb09..4b91cdc77d 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.14.0 \ No newline at end of file
+15.14.1 \ 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 65c91de0e3..781b23c5bb 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.14.0".freeze
+ VERSION = "15.14.1".freeze
end
#
diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb
index 3736eb3a13..dbb39ade44 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.14.0".freeze
+ VERSION = "15.14.1".freeze
end
diff --git a/chef-utils/lib/chef-utils/version.rb b/chef-utils/lib/chef-utils/version.rb
index 87348c39d7..00ace6e736 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.14.0".freeze
+ VERSION = "15.14.1".freeze
end
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 4fff1cae28..5c6828a027 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.14.0")
+ VERSION = Chef::VersionString.new("15.14.1")
end
#