Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/bundler/omnibus/artifactory-3.0.17
Browse files Browse the repository at this point in the history
  • Loading branch information
ashiqueps authored Apr 2, 2024
2 parents 8f129ce + 9b75e70 commit b6ca778
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 20 deletions.
7 changes: 4 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
<!-- usage documentation: https://expeditor.chef.io/docs/reference/changelog/ -->
<!-- latest_release 24.4.1059 -->
## [24.4.1059](https://github.com/chef/chef-workstation/tree/24.4.1059) (2024-04-02)
<!-- latest_release 24.4.1060 -->
## [24.4.1060](https://github.com/chef/chef-workstation/tree/24.4.1060) (2024-04-02)

#### Merged Pull Requests
- Updated chef-client to 18.4.2 [#3205](https://github.com/chef/chef-workstation/pull/3205) ([nikhil2611](https://github.com/nikhil2611))
- Update Netlify docs deploy method [#3217](https://github.com/chef/chef-workstation/pull/3217) ([IanMadd](https://github.com/IanMadd))
<!-- latest_release -->

<!-- release_rollup since=24.2.1058 -->
### Changes not yet released to stable

#### Merged Pull Requests
- Update Netlify docs deploy method [#3217](https://github.com/chef/chef-workstation/pull/3217) ([IanMadd](https://github.com/IanMadd)) <!-- 24.4.1060 -->
- Updated chef-client to 18.4.2 [#3205](https://github.com/chef/chef-workstation/pull/3205) ([nikhil2611](https://github.com/nikhil2611)) <!-- 24.4.1059 -->
<!-- release_rollup -->

Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
24.4.1059
24.4.1060
31 changes: 15 additions & 16 deletions omnibus/Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
GIT
remote: https://github.com/chef/omnibus-software.git
revision: 9d0fd56137fd5c790cd07c340dfc5ba30e554968
revision: 4ea194c46d42899f95db963f38abb9347a3d4731
branch: main
specs:
omnibus-software (24.1.310)
omnibus-software (24.3.315)
omnibus (>= 9.0.0)

GIT
Expand Down Expand Up @@ -34,13 +34,13 @@ GEM
artifactory (3.0.17)
awesome_print (1.9.2)
aws-eventstream (1.3.0)
aws-partitions (1.888.0)
aws-sdk-core (3.191.1)
aws-partitions (1.902.0)
aws-sdk-core (3.191.5)
aws-eventstream (~> 1, >= 1.3.0)
aws-partitions (~> 1, >= 1.651.0)
aws-sigv4 (~> 1.8)
jmespath (~> 1, >= 1.6.1)
aws-sdk-kms (1.77.0)
aws-sdk-kms (1.78.0)
aws-sdk-core (~> 3, >= 3.191.0)
aws-sigv4 (~> 1.1)
aws-sdk-s3 (1.116.0)
Expand Down Expand Up @@ -188,13 +188,12 @@ GEM
faraday-net_http (>= 2.0, < 3.2)
faraday-follow_redirects (0.3.0)
faraday (>= 1, < 3)
faraday-net_http (3.1.0)
net-http
ffi (1.15.5)
ffi (1.15.5-x64-mingw-ucrt)
ffi (1.15.5-x64-mingw32)
ffi (1.15.5-x86-mingw32)
ffi-libarchive (1.1.14)
faraday-net_http (3.0.2)
ffi (1.16.3)
ffi (1.16.3-x64-mingw-ucrt)
ffi (1.16.3-x64-mingw32)
ffi (1.16.3-x86-mingw32)
ffi-libarchive (1.1.13)
ffi (~> 1.0)
ffi-win32-extensions (1.0.4)
ffi
Expand Down Expand Up @@ -290,7 +289,7 @@ GEM
molinillo (0.8.0)
multi_json (1.15.0)
multipart-post (2.4.0)
net-ftp (0.3.4)
net-ftp (0.2.0)
net-protocol
time
net-http (0.4.1)
Expand Down Expand Up @@ -414,7 +413,7 @@ GEM
toml-rb (2.2.0)
citrus (~> 3.0, > 3.0)
tomlrb (1.3.0)
train-core (3.11.0)
train-core (3.12.0)
addressable (~> 2.5)
ffi (!= 1.13.0)
json (>= 1.8, < 3.0)
Expand Down Expand Up @@ -447,8 +446,8 @@ GEM
pastel (~> 0.8)
strings (~> 0.2.0)
tty-screen (~> 0.8)
unf_ext (0.0.8.2)
unf_ext (0.0.8.2-x64-mingw-ucrt)
unf_ext (0.0.9.1)
unf_ext (0.0.9.1-x64-mingw-ucrt)
unicode-display_width (2.5.0)
unicode_utils (1.4.0)
uri (0.13.0)
Expand Down

0 comments on commit b6ca778

Please sign in to comment.