diff options
author | John McCrae <john.mccrae@progress.com> | 2023-02-23 10:26:14 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-02-23 10:26:14 -0800 |
commit | c0cceeb0b18ab44cecf07179389076a5a147b2e6 (patch) | |
tree | b02c9748540004a4763bc1da3ac3800e98fc721d | |
parent | 27d63e7331fc2775699cc8c77e8c809cd9ae647f (diff) | |
parent | 06e13b3e2d13e1c93206713ca0608075c0683157 (diff) | |
download | chef-c0cceeb0b18ab44cecf07179389076a5a147b2e6.tar.gz |
Merge branch 'chef-17' into expeditor/_chef-vault_4.1.11
-rw-r--r-- | CHANGELOG.md | 9 | ||||
-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/version.rb | 2 | ||||
-rw-r--r-- | omnibus/Gemfile.lock | 48 |
9 files changed, 50 insertions, 45 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 16659c9819..976aa40c2b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,17 +1,20 @@ <!-- 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 17.10.29 --> -## [v17.10.29](https://github.com/chef/chef/tree/v17.10.29) (2022-12-06) +<!-- latest_release 17.10.32 --> +## [v17.10.32](https://github.com/chef/chef/tree/v17.10.32) (2023-02-23) #### Merged Pull Requests -- [chef-17] Pipeline fixes [#13399](https://github.com/chef/chef/pull/13399) ([Stromweld](https://github.com/Stromweld)) +- Bump kitchen-vagrant from 1.11.0 to 1.14.1 in /omnibus [#13602](https://github.com/chef/chef/pull/13602) ([dependabot[bot]](https://github.com/dependabot[bot])) <!-- latest_release --> <!-- release_rollup since=17.10.0 --> ### Changes not yet released to stable #### Merged Pull Requests +- Bump kitchen-vagrant from 1.11.0 to 1.14.1 in /omnibus [#13602](https://github.com/chef/chef/pull/13602) ([dependabot[bot]](https://github.com/dependabot[bot])) <!-- 17.10.32 --> +- Bump plist to 3.7.0 [#13595](https://github.com/chef/chef/pull/13595) ([chef-expeditor[bot]](https://github.com/chef-expeditor[bot])) <!-- 17.10.31 --> +- Bump omnibus-software from `a63bd71` to `87f418b` in /omnibus [#13607](https://github.com/chef/chef/pull/13607) ([dependabot[bot]](https://github.com/dependabot[bot])) <!-- 17.10.30 --> - [chef-17] Pipeline fixes [#13399](https://github.com/chef/chef/pull/13399) ([Stromweld](https://github.com/Stromweld)) <!-- 17.10.29 --> - Fix chef-17 pipelines [#13253](https://github.com/chef/chef/pull/13253) ([jaymzh](https://github.com/jaymzh)) <!-- 17.10.28 --> - [chef-17] Update omnibus version to fix read_shared_libs to fix solaris adhoc pipeline issue [#13243](https://github.com/chef/chef/pull/13243) ([blabade](https://github.com/blabade)) <!-- 17.10.27 --> diff --git a/Gemfile.lock b/Gemfile.lock index fbfdb409db..250760acbc 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -35,12 +35,12 @@ GIT PATH remote: . specs: - chef (17.10.29) + chef (17.10.32) addressable aws-sdk-s3 (~> 1.91) aws-sdk-secretsmanager (~> 1.46) - chef-config (= 17.10.29) - chef-utils (= 17.10.29) + chef-config (= 17.10.32) + chef-utils (= 17.10.32) chef-vault chef-zero (>= 14.0.11) corefoundation (~> 0.3.4) @@ -66,13 +66,13 @@ PATH train-winrm (>= 0.2.5) uuidtools (>= 2.1.5, < 3.0) vault (~> 0.16) - chef (17.10.29-universal-mingw32) + chef (17.10.32-universal-mingw32) addressable aws-sdk-s3 (~> 1.91) aws-sdk-secretsmanager (~> 1.46) - chef-config (= 17.10.29) + chef-config (= 17.10.32) chef-powershell (~> 1.0.12) - chef-utils (= 17.10.29) + chef-utils (= 17.10.32) chef-vault chef-zero (>= 14.0.11) corefoundation (~> 0.3.4) @@ -113,15 +113,15 @@ PATH PATH remote: chef-bin specs: - chef-bin (17.10.29) - chef (= 17.10.29) + chef-bin (17.10.32) + chef (= 17.10.32) PATH remote: chef-config specs: - chef-config (17.10.29) + chef-config (17.10.32) addressable - chef-utils (= 17.10.29) + chef-utils (= 17.10.32) fuzzyurl mixlib-config (>= 2.2.12, < 4.0) mixlib-shellout (>= 2.0, < 4.0) @@ -130,7 +130,7 @@ PATH PATH remote: chef-utils specs: - chef-utils (17.10.29) + chef-utils (17.10.32) concurrent-ruby GEM @@ -143,7 +143,7 @@ GEM mixlib-shellout (>= 2.0, < 4.0) ast (2.4.2) aws-eventstream (1.2.0) - aws-partitions (1.713.0) + aws-partitions (1.715.0) aws-sdk-core (3.170.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.651.0) @@ -300,7 +300,7 @@ GEM parslet (1.8.2) pastel (0.8.0) tty-color (~> 0.5) - plist (3.6.0) + plist (3.7.0) proxifier (1.0.3) pry (0.13.0) coderay (~> 1.1) @@ -1 +1 @@ -17.10.29
\ No newline at end of file +17.10.32
\ 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 8cfe56ec82..b1f39695b0 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 = "17.10.29".freeze + VERSION = "17.10.32".freeze end # diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb index 765fbadeb8..8225ce44b3 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 = "17.10.29".freeze + VERSION = "17.10.32".freeze end diff --git a/chef-utils/lib/chef-utils/version.rb b/chef-utils/lib/chef-utils/version.rb index a56b1d73e9..73d30c6543 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 = "17.10.29" + VERSION = "17.10.32" end diff --git a/knife/lib/chef/knife/version.rb b/knife/lib/chef/knife/version.rb index e3e60ded64..e25790ea32 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 = "17.10.29".freeze + VERSION = "17.10.32".freeze end end diff --git a/lib/chef/version.rb b/lib/chef/version.rb index b5abe47187..bb8c1fe54b 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("17.10.29") + VERSION = Chef::VersionString.new("17.10.32") end # diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock index 4210d718b3..c1f50199f8 100644 --- a/omnibus/Gemfile.lock +++ b/omnibus/Gemfile.lock @@ -1,9 +1,9 @@ GIT remote: https://github.com/chef/omnibus-software.git - revision: a63bd71702f5bf350ca17ee0726ac36fc418d54e + revision: 87f418ba21110417a7bed65e587dff221dc8c457 branch: main specs: - omnibus-software (4.0.0) + omnibus-software (23.2.285) omnibus (>= 9.0.0) GIT @@ -34,17 +34,17 @@ GEM artifactory (3.0.15) awesome_print (1.9.2) aws-eventstream (1.2.0) - aws-partitions (1.648.0) - aws-sdk-core (3.162.0) + aws-partitions (1.715.0) + aws-sdk-core (3.170.0) aws-eventstream (~> 1, >= 1.0.2) - aws-partitions (~> 1, >= 1.525.0) - aws-sigv4 (~> 1.1) + aws-partitions (~> 1, >= 1.651.0) + aws-sigv4 (~> 1.5) jmespath (~> 1, >= 1.6.1) - aws-sdk-kms (1.58.0) - aws-sdk-core (~> 3, >= 3.127.0) + aws-sdk-kms (1.62.0) + aws-sdk-core (~> 3, >= 3.165.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.115.0) - aws-sdk-core (~> 3, >= 3.127.0) + aws-sdk-s3 (1.119.1) + aws-sdk-core (~> 3, >= 3.165.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.4) aws-sdk-secretsmanager (1.61.0) @@ -53,6 +53,8 @@ GEM aws-sigv4 (1.5.2) aws-eventstream (~> 1, >= 1.0.2) bcrypt_pbkdf (1.1.0) + bcrypt_pbkdf (1.1.0-x64-mingw32) + bcrypt_pbkdf (1.1.0-x86-mingw32) berkshelf (8.0.1) chef (>= 15.7.32) chef-config @@ -168,13 +170,13 @@ GEM citrus (3.0.2) cleanroom (1.0.0) coderay (1.1.3) - concurrent-ruby (1.1.10) + concurrent-ruby (1.2.0) contracts (0.16.1) corefoundation (0.3.13) ffi (>= 1.15.0) diff-lcs (1.5.0) ed25519 (1.3.0) - erubi (1.10.0) + erubi (1.12.0) erubis (2.7.0) faraday (1.4.3) faraday-em_http (~> 1.0) @@ -233,12 +235,12 @@ GEM train-core (~> 3.0) tty-prompt (~> 0.17) tty-table (~> 0.10) - iostruct (0.0.4) + iostruct (0.0.5) ipaddress (0.8.3) iso8601 (0.13.0) - jmespath (1.6.1) - json (2.6.2) - kitchen-vagrant (1.11.0) + jmespath (1.6.2) + json (2.6.3) + kitchen-vagrant (1.14.1) test-kitchen (>= 1.4, < 4) libyajl2 (2.1.0) license-acceptance (2.1.13) @@ -246,12 +248,12 @@ GEM tomlrb (>= 1.2, < 3.0) tty-box (~> 0.6) tty-prompt (~> 0.20) - license_scout (1.3.2) + license_scout (1.3.4) ffi-yajl (~> 2.2) mixlib-shellout (>= 2.2, < 4.0) toml-rb (>= 1, < 3) little-plugger (1.1.4) - logging (2.3.0) + logging (2.3.1) little-plugger (~> 1.1) multi_json (~> 1.14) method_source (1.0.0) @@ -264,7 +266,7 @@ GEM mixlib-cli (2.1.8) mixlib-config (3.0.27) tomlrb - mixlib-install (3.12.16) + mixlib-install (3.12.27) mixlib-shellout mixlib-versioning thor @@ -279,7 +281,7 @@ GEM mixlib-versioning (1.2.12) molinillo (0.8.0) multi_json (1.15.0) - multipart-post (2.2.3) + multipart-post (2.3.0) net-scp (3.0.0) net-ssh (>= 2.6.5, < 7.0.0) net-sftp (3.0.0) @@ -314,12 +316,12 @@ GEM multipart-post (>= 2.0.0) rainbow zhexdump (>= 0.0.2) - plist (3.6.0) + plist (3.7.0) proxifier (1.0.3) pry (0.14.1) coderay (~> 1.1) method_source (~> 1.0) - public_suffix (5.0.0) + public_suffix (5.0.1) rack (2.2.3) rainbow (3.1.1) retryable (3.0.5) @@ -406,7 +408,7 @@ GEM pastel (~> 0.8) strings (~> 0.2.0) tty-screen (~> 0.8) - unicode-display_width (2.1.0) + unicode-display_width (2.4.2) unicode_utils (1.4.0) uuidtools (2.2.0) vault (0.17.0) |