summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <expeditor@chef.io>2019-11-04 21:57:14 +0000
committerChef Expeditor <expeditor@chef.io>2019-11-04 21:57:14 +0000
commit72352921c1b03957fdf39794737f45c88a9346ba (patch)
treecd710249fd33329194738b646bc0194812c9803b
parent89f2aac1d6938f2165d829632847d40e705a03f0 (diff)
downloadchef-72352921c1b03957fdf39794737f45c88a9346ba.tar.gz
Bump version to 15.4.64 by Chef Expeditorv15.4.64
Obvious fix; these changes are the result of automation not creative thinking.
-rw-r--r--CHANGELOG.md7
-rw-r--r--Gemfile.lock14
-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, 15 insertions, 14 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index fd32ef3749..d31c855a00 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.63 -->
-## [v15.4.63](https://github.com/chef/chef/tree/v15.4.63) (2019-11-04)
+<!-- latest_release 15.4.64 -->
+## [v15.4.64](https://github.com/chef/chef/tree/v15.4.64) (2019-11-04)
#### Merged Pull Requests
-- systemd_unit needs to log [#9046](https://github.com/chef/chef/pull/9046) ([jaymzh](https://github.com/jaymzh))
+- Update lixml2, libxslt, and nokogiri to the latest [#9054](https://github.com/chef/chef/pull/9054) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup since=15.4.45 -->
### Changes not yet released to stable
#### Merged Pull Requests
+- Update lixml2, libxslt, and nokogiri to the latest [#9054](https://github.com/chef/chef/pull/9054) ([tas50](https://github.com/tas50)) <!-- 15.4.64 -->
- systemd_unit needs to log [#9046](https://github.com/chef/chef/pull/9046) ([jaymzh](https://github.com/jaymzh)) <!-- 15.4.63 -->
- Update omnibus [#9050](https://github.com/chef/chef/pull/9050) ([jaymalasinha](https://github.com/jaymalasinha)) <!-- 15.4.62 -->
- [knife config get] Fix TypeError: no implicit conversion of nil into String [#9049](https://github.com/chef/chef/pull/9049) ([vsingh-msys](https://github.com/vsingh-msys)) <!-- 15.4.61 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 6ebab575c8..24f7a40ec0 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -27,11 +27,11 @@ GIT
PATH
remote: .
specs:
- chef (15.4.63)
+ chef (15.4.64)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
- chef-config (= 15.4.63)
+ chef-config (= 15.4.64)
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.63-universal-mingw32)
+ chef (15.4.64-universal-mingw32)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
- chef-config (= 15.4.63)
+ chef-config (= 15.4.64)
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.63)
- chef (= 15.4.63)
+ chef-bin (15.4.64)
+ chef (= 15.4.64)
PATH
remote: chef-config
specs:
- chef-config (15.4.63)
+ chef-config (15.4.64)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 4.0)
diff --git a/VERSION b/VERSION
index 33740986d8..42a76a10f6 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.4.63 \ No newline at end of file
+15.4.64 \ 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 7342d09ac4..faeceb93d9 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.63".freeze
+ VERSION = "15.4.64".freeze
end
#
diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb
index b657abb8e1..4ce18d7242 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.63".freeze
+ VERSION = "15.4.64".freeze
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index dd0a8ca604..3b1793d79e 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.63")
+ VERSION = Chef::VersionString.new("15.4.64")
end
#