diff options
| -rw-r--r-- | CHANGELOG.md | 7 | ||||
| -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 |
7 files changed, 20 insertions, 19 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index c519635712..2c0f1d19b9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,15 +1,16 @@ <!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ --> -<!-- latest_release 16.2.69 --> -## [v16.2.69](https://github.com/chef/chef/tree/v16.2.69) (2020-06-29) +<!-- latest_release 16.2.70 --> +## [v16.2.70](https://github.com/chef/chef/tree/v16.2.70) (2020-06-30) #### Merged Pull Requests -- Bump inspec-core-bin to 4.21.1 [#10081](https://github.com/chef/chef/pull/10081) ([chef-expeditor[bot]](https://github.com/chef-expeditor[bot])) +- Pin dff-lcs, bump ohai, & misc omnibus updates [#10085](https://github.com/chef/chef/pull/10085) ([tas50](https://github.com/tas50)) <!-- latest_release --> <!-- release_rollup since=16.2.50 --> ### Changes not yet released to stable #### Merged Pull Requests +- Pin dff-lcs, bump ohai, & misc omnibus updates [#10085](https://github.com/chef/chef/pull/10085) ([tas50](https://github.com/tas50)) <!-- 16.2.70 --> - Bump inspec-core-bin to 4.21.1 [#10081](https://github.com/chef/chef/pull/10081) ([chef-expeditor[bot]](https://github.com/chef-expeditor[bot])) <!-- 16.2.69 --> - specs: Remove test file that added a method to top-level scope. [#10027](https://github.com/chef/chef/pull/10027) ([phiggins](https://github.com/phiggins)) <!-- 16.2.68 --> - Revert "Merge pull request #10052 from chef/fix-diff-tests" [#10078](https://github.com/chef/chef/pull/10078) ([phiggins](https://github.com/phiggins)) <!-- 16.2.67 --> diff --git a/Gemfile.lock b/Gemfile.lock index 5b582a66a3..cf466d76bd 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -28,12 +28,12 @@ GIT PATH remote: . specs: - chef (16.2.69) + chef (16.2.70) addressable bcrypt_pbkdf (= 1.1.0.rc1) bundler (>= 1.10) - chef-config (= 16.2.69) - chef-utils (= 16.2.69) + chef-config (= 16.2.70) + chef-utils (= 16.2.70) chef-vault chef-zero (>= 14.0.11) diff-lcs (>= 1.2.4, < 1.4.0) @@ -62,12 +62,12 @@ PATH train-winrm (>= 0.2.5) tty-screen (~> 0.6) uuidtools (~> 2.1.5) - chef (16.2.69-universal-mingw32) + chef (16.2.70-universal-mingw32) addressable bcrypt_pbkdf (= 1.1.0.rc1) bundler (>= 1.10) - chef-config (= 16.2.69) - chef-utils (= 16.2.69) + chef-config (= 16.2.70) + chef-utils (= 16.2.70) chef-vault chef-zero (>= 14.0.11) diff-lcs (>= 1.2.4, < 1.4.0) @@ -112,15 +112,15 @@ PATH PATH remote: chef-bin specs: - chef-bin (16.2.69) - chef (= 16.2.69) + chef-bin (16.2.70) + chef (= 16.2.70) PATH remote: chef-config specs: - chef-config (16.2.69) + chef-config (16.2.70) addressable - chef-utils (= 16.2.69) + chef-utils (= 16.2.70) fuzzyurl mixlib-config (>= 2.2.12, < 4.0) mixlib-shellout (>= 2.0, < 4.0) @@ -129,7 +129,7 @@ PATH PATH remote: chef-utils specs: - chef-utils (16.2.69) + chef-utils (16.2.70) GEM remote: https://rubygems.org/ @@ -1 +1 @@ -16.2.69
\ No newline at end of file +16.2.70
\ 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 e645ee91f2..378a546ef9 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("../..", __FILE__) - VERSION = "16.2.69".freeze + VERSION = "16.2.70".freeze end # diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb index f0a33497e1..4c3475fc08 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("../..", __FILE__) - VERSION = "16.2.69".freeze + VERSION = "16.2.70".freeze end diff --git a/chef-utils/lib/chef-utils/version.rb b/chef-utils/lib/chef-utils/version.rb index d84fb747e7..1758d58331 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("../..", __FILE__) - VERSION = "16.2.69".freeze + VERSION = "16.2.70".freeze end diff --git a/lib/chef/version.rb b/lib/chef/version.rb index fa2cce0f9a..f07691c218 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("../..", __FILE__) - VERSION = Chef::VersionString.new("16.2.69") + VERSION = Chef::VersionString.new("16.2.70") end # |