diff options
author | John McCrae <john.mccrae@progress.com> | 2022-03-28 16:57:36 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-03-28 16:57:36 -0700 |
commit | 85596608db5680a283179cda2f2bff4044594078 (patch) | |
tree | 224b079a7a8a1356118e71eb381802a089543ccd | |
parent | 52ef0c8a9835ce5559eccfda7973312ac26d739d (diff) | |
parent | 38fd05fcde6ee345dbf31ee15cc469019bce3dca (diff) | |
download | chef-85596608db5680a283179cda2f2bff4044594078.tar.gz |
Merge branch 'main' into INFC-7
-rw-r--r-- | CHANGELOG.md | 8 | ||||
-rw-r--r-- | Gemfile.lock | 26 | ||||
-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-- | knife/lib/chef/knife/version.rb | 2 | ||||
-rw-r--r-- | lib/chef/provider/package/powershell.rb | 2 | ||||
-rw-r--r-- | lib/chef/version.rb | 2 | ||||
-rw-r--r-- | omnibus_overrides.rb | 2 |
10 files changed, 26 insertions, 24 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 05598f58b0..dd698ea7a0 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 18.0.75 --> -## [v18.0.75](https://github.com/chef/chef/tree/v18.0.75) (2022-03-24) +<!-- latest_release 18.0.77 --> +## [v18.0.77](https://github.com/chef/chef/tree/v18.0.77) (2022-03-28) #### Merged Pull Requests -- update chef client launchd to run at load [#12706](https://github.com/chef/chef/pull/12706) ([rishichawda](https://github.com/rishichawda)) +- update libxml2 to 2.9.12 [#12730](https://github.com/chef/chef/pull/12730) ([johnmccrae](https://github.com/johnmccrae)) <!-- latest_release --> <!-- release_rollup since=17.9.26 --> ### Changes not yet released to stable #### Merged Pull Requests +- update libxml2 to 2.9.12 [#12730](https://github.com/chef/chef/pull/12730) ([johnmccrae](https://github.com/johnmccrae)) <!-- 18.0.77 --> +- Package resource was calling a non-existent error method [#12722](https://github.com/chef/chef/pull/12722) ([johnmccrae](https://github.com/johnmccrae)) <!-- 18.0.76 --> - update chef client launchd to run at load [#12706](https://github.com/chef/chef/pull/12706) ([rishichawda](https://github.com/rishichawda)) <!-- 18.0.75 --> - Enable ruby 3.1 testing on verify pipeline for unix, fix breakage [#12695](https://github.com/chef/chef/pull/12695) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 18.0.74 --> - Use the latest libarchive (3.6.0) [#12648](https://github.com/chef/chef/pull/12648) ([tas50](https://github.com/tas50)) <!-- 18.0.73 --> diff --git a/Gemfile.lock b/Gemfile.lock index fa05e003d2..4d31ec7768 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -42,12 +42,12 @@ GIT PATH remote: . specs: - chef (18.0.75) + chef (18.0.77) addressable aws-sdk-s3 (~> 1.91) aws-sdk-secretsmanager (~> 1.46) - chef-config (= 18.0.75) - chef-utils (= 18.0.75) + chef-config (= 18.0.77) + chef-utils (= 18.0.77) chef-vault chef-zero (>= 14.0.11) corefoundation (~> 0.3.4) @@ -75,13 +75,13 @@ PATH train-winrm (>= 0.2.5) uuidtools (>= 2.1.5, < 3.0) vault (~> 0.16) - chef (18.0.75-universal-mingw32) + chef (18.0.77-universal-mingw32) addressable aws-sdk-s3 (~> 1.91) aws-sdk-secretsmanager (~> 1.46) - chef-config (= 18.0.75) + chef-config (= 18.0.77) chef-powershell (~> 1.0.12) - chef-utils (= 18.0.75) + chef-utils (= 18.0.77) chef-vault chef-zero (>= 14.0.11) corefoundation (~> 0.3.4) @@ -124,15 +124,15 @@ PATH PATH remote: chef-bin specs: - chef-bin (18.0.75) - chef (= 18.0.75) + chef-bin (18.0.77) + chef (= 18.0.77) PATH remote: chef-config specs: - chef-config (18.0.75) + chef-config (18.0.77) addressable - chef-utils (= 18.0.75) + chef-utils (= 18.0.77) fuzzyurl mixlib-config (>= 2.2.12, < 4.0) mixlib-shellout (>= 2.0, < 4.0) @@ -141,7 +141,7 @@ PATH PATH remote: chef-utils specs: - chef-utils (18.0.75) + chef-utils (18.0.77) concurrent-ruby GEM @@ -154,7 +154,7 @@ GEM mixlib-shellout (>= 2.0, < 4.0) ast (2.4.2) aws-eventstream (1.2.0) - aws-partitions (1.570.0) + aws-partitions (1.571.0) aws-sdk-core (3.130.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.525.0) @@ -527,4 +527,4 @@ DEPENDENCIES webmock BUNDLED WITH - 2.3.6 + 2.3.5 @@ -1 +1 @@ -18.0.75
\ No newline at end of file +18.0.77
\ 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 39b26161e6..63fdc70ac3 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 = "18.0.75".freeze + VERSION = "18.0.77".freeze end # diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb index d77a6b2fef..a7ce2bc839 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 = "18.0.75".freeze + VERSION = "18.0.77".freeze end diff --git a/chef-utils/lib/chef-utils/version.rb b/chef-utils/lib/chef-utils/version.rb index 2998e3b4ac..e80ffce1fe 100644 --- a/chef-utils/lib/chef-utils/version.rb +++ b/chef-utils/lib/chef-utils/version.rb @@ -16,5 +16,5 @@ module ChefUtils CHEFUTILS_ROOT = File.expand_path("..", __dir__) - VERSION = "18.0.75" + VERSION = "18.0.77" end diff --git a/knife/lib/chef/knife/version.rb b/knife/lib/chef/knife/version.rb index 6f44f80b01..679d642425 100644 --- a/knife/lib/chef/knife/version.rb +++ b/knife/lib/chef/knife/version.rb @@ -17,7 +17,7 @@ class Chef class Knife KNIFE_ROOT = File.expand_path("../..", __dir__) - VERSION = "18.0.75".freeze + VERSION = "18.0.77".freeze end end diff --git a/lib/chef/provider/package/powershell.rb b/lib/chef/provider/package/powershell.rb index 2fe6cc2abc..caccb501d9 100644 --- a/lib/chef/provider/package/powershell.rb +++ b/lib/chef/provider/package/powershell.rb @@ -56,7 +56,7 @@ class Chef names.each_with_index do |name, index| cmd = powershell_exec(build_powershell_package_command("Install-Package '#{name}'", versions[index]), timeout: new_resource.timeout) next if cmd.nil? - raise Chef::Exceptions::PowershellCmdletException, "Failed to install package due to catalog signing error, use skip_publisher_check to force install" if /SkipPublisherCheck/.match?(cmd.error) + raise Chef::Exceptions::PowershellCmdletException, "Failed to install package due to catalog signing error, use skip_publisher_check to force install" if /SkipPublisherCheck/.match?(cmd.error!) end end diff --git a/lib/chef/version.rb b/lib/chef/version.rb index 9f3a58e618..d9262fee83 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("18.0.75") + VERSION = Chef::VersionString.new("18.0.77") end # diff --git a/omnibus_overrides.rb b/omnibus_overrides.rb index 64c435204d..c41d2fa724 100644 --- a/omnibus_overrides.rb +++ b/omnibus_overrides.rb @@ -7,7 +7,7 @@ override "libffi", version: "3.4.2" override "libiconv", version: "1.16" override "liblzma", version: "5.2.5" override "libtool", version: "2.4.2" -override "libxml2", version: "2.9.10" +override "libxml2", version: "2.9.12" override "libxslt", version: "1.1.34" override "libyaml", version: "0.1.7" override "makedepend", version: "1.0.5" |