summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <expeditor@chef.io>2019-11-05 06:18:20 +0000
committerChef Expeditor <expeditor@chef.io>2019-11-05 06:18:20 +0000
commit498b2dc23778176b0a018b2559cdb3036aeeef35 (patch)
tree192d5a8ba0925a135716fa17ed2886bd68946110
parenta3c45f5ab301af3af9ff56ca0d1b20cebf2c5b23 (diff)
downloadchef-498b2dc23778176b0a018b2559cdb3036aeeef35.tar.gz
Bump version to 15.4.67 by Chef Expeditorv15.4.67
Obvious fix; these changes are the result of automation not creative thinking.
-rw-r--r--CHANGELOG.md7
-rw-r--r--Gemfile.lock23
-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--lib/chef/version.rb2
6 files changed, 20 insertions, 18 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2edbbf457f..298ecc5e13 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 15.4.66 -->
-## [v15.4.66](https://github.com/chef/chef/tree/v15.4.66) (2019-11-05)
+<!-- latest_release 15.4.67 -->
+## [v15.4.67](https://github.com/chef/chef/tree/v15.4.67) (2019-11-05)
#### Merged Pull Requests
-- service/systemd_unit: Don&#39;t try to reenable services in an indirect status [#9047](https://github.com/chef/chef/pull/9047) ([jaymzh](https://github.com/jaymzh))
+- dist constants in win logs [#9058](https://github.com/chef/chef/pull/9058) ([bobchaos](https://github.com/bobchaos))
<!-- latest_release -->
<!-- release_rollup since=15.4.45 -->
### Changes not yet released to stable
#### Merged Pull Requests
+- dist constants in win logs [#9058](https://github.com/chef/chef/pull/9058) ([bobchaos](https://github.com/bobchaos)) <!-- 15.4.67 -->
- service/systemd_unit: Don&#39;t try to reenable services in an indirect status [#9047](https://github.com/chef/chef/pull/9047) ([jaymzh](https://github.com/jaymzh)) <!-- 15.4.66 -->
- Updates for Chefstyle with Rubocop 0.75.1 [#9055](https://github.com/chef/chef/pull/9055) ([tas50](https://github.com/tas50)) <!-- 15.4.65 -->
- Update lixml2, libxslt, and nokogiri to the latest [#9054](https://github.com/chef/chef/pull/9054) ([tas50](https://github.com/tas50)) <!-- 15.4.64 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index bc3550114d..09d4f30708 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -27,11 +27,11 @@ GIT
PATH
remote: .
specs:
- chef (15.4.66)
+ chef (15.4.67)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
- chef-config (= 15.4.66)
+ chef-config (= 15.4.67)
chef-zero (>= 14.0.11)
diff-lcs (~> 1.2, >= 1.2.4)
ed25519 (~> 1.2)
@@ -58,11 +58,11 @@ PATH
train-winrm (>= 0.2.5)
tty-screen (~> 0.6)
uuidtools (~> 2.1.5)
- chef (15.4.66-universal-mingw32)
+ chef (15.4.67-universal-mingw32)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
- chef-config (= 15.4.66)
+ chef-config (= 15.4.67)
chef-zero (>= 14.0.11)
diff-lcs (~> 1.2, >= 1.2.4)
ed25519 (~> 1.2)
@@ -105,13 +105,13 @@ PATH
PATH
remote: chef-bin
specs:
- chef-bin (15.4.66)
- chef (= 15.4.66)
+ chef-bin (15.4.67)
+ chef (= 15.4.67)
PATH
remote: chef-config
specs:
- chef-config (15.4.66)
+ chef-config (15.4.67)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 4.0)
@@ -152,6 +152,7 @@ GEM
docile (1.3.2)
ed25519 (1.2.4)
equatable (0.6.1)
+ erubi (1.9.0)
erubis (2.7.0)
faraday (0.17.0)
multipart-post (>= 1.2, < 3)
@@ -387,17 +388,17 @@ GEM
win32-taskscheduler (2.0.4)
ffi
structured_warnings
- winrm (2.3.2)
+ winrm (2.3.3)
builder (>= 2.1.2)
- erubis (~> 2.7)
+ erubi (~> 1.8)
gssapi (~> 1.2)
gyoku (~> 1.0)
httpclient (~> 2.2, >= 2.2.0.2)
logging (>= 1.6.1, < 3.0)
nori (~> 2.0)
rubyntlm (~> 0.6.0, >= 0.6.1)
- winrm-fs (1.3.2)
- erubis (~> 2.7)
+ winrm-fs (1.3.3)
+ erubi (~> 1.8)
logging (>= 1.6.1, < 3.0)
rubyzip (~> 1.1)
winrm (~> 2.0)
diff --git a/VERSION b/VERSION
index ab6ffc8785..25b3bee525 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.4.66 \ No newline at end of file
+15.4.67 \ 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 9bfd5a316a..67daa0ac14 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.4.66".freeze
+ VERSION = "15.4.67".freeze
end
#
diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb
index 55fb78e17c..d16d846011 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 = "15.4.66".freeze
+ VERSION = "15.4.67".freeze
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 8c2e59f424..cf03ee003b 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.4.66")
+ VERSION = Chef::VersionString.new("15.4.67")
end
#