diff options
author | Tim Smith <tsmith@chef.io> | 2021-01-05 19:11:51 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-01-05 19:11:51 -0800 |
commit | 350bb031ae257c67f28dc69b7482221a251d65cd (patch) | |
tree | aeb77cf03bc1bc155fd6d60eff53641bcd50ddf5 | |
parent | 6dbdb5ea1d06236caf8a8283145b0dbe81fadc93 (diff) | |
parent | ecbf0badb607e259ffbeb85ad653b252fb66c2ea (diff) | |
download | chef-350bb031ae257c67f28dc69b7482221a251d65cd.tar.gz |
Merge branch 'chef-15' into metadata_15
-rw-r--r-- | CHANGELOG.md | 8 | ||||
-rw-r--r-- | Gemfile.lock | 22 | ||||
-rw-r--r-- | VERSION | 2 | ||||
-rw-r--r-- | chef-bin/lib/chef-bin/version.rb | 2 | ||||
-rw-r--r-- | chef-config/lib/chef-config/version.rb | 2 | ||||
-rw-r--r-- | chef-utils/lib/chef-utils/version.rb | 2 | ||||
-rw-r--r-- | lib/chef/version.rb | 2 | ||||
-rw-r--r-- | omnibus_overrides.rb | 2 |
8 files changed, 22 insertions, 20 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 5b9325fbcc..23455a8917 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,17 +1,19 @@ <!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ --> + This changelog lists individual merged pull requests to Chef Infra Client and geared towards developers. For a list of significant changes per release see the [Chef Infra Client Release Notes](https://docs.chef.io/release_notes_client/). -<!-- latest_release 15.14.3 --> -## [v15.14.3](https://github.com/chef/chef/tree/v15.14.3) (2020-12-21) +<!-- latest_release 15.14.4 --> +## [v15.14.4](https://github.com/chef/chef/tree/v15.14.4) (2021-01-06) #### Merged Pull Requests -- Bump openssl, libarchive, libiconv, and libffi to the latest [#10771](https://github.com/chef/chef/pull/10771) ([tas50](https://github.com/tas50)) +- Update Nokogiri to 1.11.0 [#10837](https://github.com/chef/chef/pull/10837) ([tas50](https://github.com/tas50)) <!-- latest_release --> <!-- release_rollup since=15.14.0 --> ### Changes not yet released to stable #### Merged Pull Requests +- Update Nokogiri to 1.11.0 [#10837](https://github.com/chef/chef/pull/10837) ([tas50](https://github.com/tas50)) <!-- 15.14.4 --> - Bump openssl, libarchive, libiconv, and libffi to the latest [#10771](https://github.com/chef/chef/pull/10771) ([tas50](https://github.com/tas50)) <!-- 15.14.3 --> - Fixed cron_d resource ignoring sensitive property in Chef 15 [#10769](https://github.com/chef/chef/pull/10769) ([axl89](https://github.com/axl89)) <!-- 15.14.2 --> - Fix Chef-15 Habitat Builds [#10460](https://github.com/chef/chef/pull/10460) ([christopher-snapp](https://github.com/christopher-snapp)) <!-- 15.14.1 --> diff --git a/Gemfile.lock b/Gemfile.lock index c4ded104c6..367de1d278 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -19,12 +19,12 @@ GIT PATH remote: . specs: - chef (15.14.3) + chef (15.14.4) addressable bcrypt_pbkdf (~> 1.0) bundler (>= 1.10) - chef-config (= 15.14.3) - chef-utils (= 15.14.3) + chef-config (= 15.14.4) + chef-utils (= 15.14.4) 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.3-universal-mingw32) + chef (15.14.4-universal-mingw32) addressable bcrypt_pbkdf (~> 1.0) bundler (>= 1.10) - chef-config (= 15.14.3) - chef-utils (= 15.14.3) + chef-config (= 15.14.4) + chef-utils (= 15.14.4) 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.3) - chef (= 15.14.3) + chef-bin (15.14.4) + chef (= 15.14.4) PATH remote: chef-config specs: - chef-config (15.14.3) + chef-config (15.14.4) addressable - chef-utils (= 15.14.3) + chef-utils (= 15.14.4) 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.3) + chef-utils (15.14.4) GEM remote: https://rubygems.org/ @@ -1 +1 @@ -15.14.3
\ No newline at end of file +15.14.4
\ 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 ff9e51e076..c005de28f6 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.3".freeze + VERSION = "15.14.4".freeze end # diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb index ad31a5f1ff..1e4f320741 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.3".freeze + VERSION = "15.14.4".freeze end diff --git a/chef-utils/lib/chef-utils/version.rb b/chef-utils/lib/chef-utils/version.rb index e67c88b07f..f827adace2 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.3".freeze + VERSION = "15.14.4".freeze end diff --git a/lib/chef/version.rb b/lib/chef/version.rb index 68e0f81a50..b55f00b931 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.3") + VERSION = Chef::VersionString.new("15.14.4") end # diff --git a/omnibus_overrides.rb b/omnibus_overrides.rb index b4e7d73904..6687edecf3 100644 --- a/omnibus_overrides.rb +++ b/omnibus_overrides.rb @@ -15,7 +15,7 @@ override "libxslt", version: "1.1.34" override "libyaml", version: "0.1.7" override "makedepend", version: "1.0.5" override "ncurses", version: "5.9" -override "nokogiri", version: "1.10.10" +override "nokogiri", version: "1.11.0" override "openssl", version: "1.0.2x" override "pkg-config-lite", version: "0.28-1" override "ruby", version: "2.6.6" |