diff options
| author | Tim Smith <tsmith@chef.io> | 2018-03-26 10:39:35 -0700 |
|---|---|---|
| committer | Tim Smith <tsmith@chef.io> | 2018-03-26 10:44:19 -0700 |
| commit | 0106eed01ffd11a9d43b522ab10be53790a9327c (patch) | |
| tree | 0f5e560f7e42627997c5d6c866033e963518b90a | |
| parent | 142778cb9db7f4f9cc606903b1f77526449136d9 (diff) | |
| download | chef-0106eed01ffd11a9d43b522ab10be53790a9327c.tar.gz | |
Parser 2.5.0.4 was yanked
We missed 2 changelog updates due to this so I'm manually adding them
Signed-off-by: Tim Smith <tsmith@chef.io>
| -rw-r--r-- | CHANGELOG.md | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 2 | ||||
| -rw-r--r-- | omnibus/Gemfile.lock | 10 |
3 files changed, 8 insertions, 6 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 44951bb0e3..b67bda34c5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,8 @@ ### Changes since 13.7.16 release #### Merged Pull Requests +- Switch chef debug logging to trace [#7039](https://github.com/chef/chef/pull/7039) ([thommay](https://github.com/thommay)) +- Remove path helpers from window_pagefile [#7048](https://github.com/chef/chef/pull/7048) ([tas50](https://github.com/tas50)) - Add swap_file resource from the swap cookbook [#6990](https://github.com/chef/chef/pull/6990) ([tas50](https://github.com/tas50)) <!-- 14.0.163 --> - Revert "Upgrade to openssl 1.1" [#7045](https://github.com/chef/chef/pull/7045) ([tas50](https://github.com/tas50)) <!-- 14.0.162 --> - Upgrade to openssl 1.1 [#7044](https://github.com/chef/chef/pull/7044) ([tas50](https://github.com/tas50)) <!-- 14.0.161 --> diff --git a/Gemfile.lock b/Gemfile.lock index 0b3d649368..5fa707f5c6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -229,7 +229,7 @@ GEM systemu (~> 2.6.4) wmi-lite (~> 1.0) parallel (1.12.1) - parser (2.5.0.4) + parser (2.5.0.5) ast (~> 2.4.0) parslet (1.8.2) plist (3.4.0) diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock index b68e7ee13e..3ffec313cc 100644 --- a/omnibus/Gemfile.lock +++ b/omnibus/Gemfile.lock @@ -31,13 +31,13 @@ GEM addressable (2.5.2) public_suffix (>= 2.0.2, < 4.0) awesome_print (1.8.0) - aws-sdk (2.11.19) - aws-sdk-resources (= 2.11.19) - aws-sdk-core (2.11.19) + aws-sdk (2.11.21) + aws-sdk-resources (= 2.11.21) + aws-sdk-core (2.11.21) aws-sigv4 (~> 1.0) jmespath (~> 1.0) - aws-sdk-resources (2.11.19) - aws-sdk-core (= 2.11.19) + aws-sdk-resources (2.11.21) + aws-sdk-core (= 2.11.21) aws-sigv4 (1.0.2) berkshelf (4.3.5) addressable (~> 2.3, >= 2.3.4) |