diff options
| author | Chef Expeditor <eng-services-ops+chef-ci@chef.io> | 2018-02-20 16:25:12 +0000 |
|---|---|---|
| committer | Chef Expeditor <eng-services-ops+chef-ci@chef.io> | 2018-02-20 16:25:12 +0000 |
| commit | 96a3ea931e21f2f579e4322457c5b88c0f18ba14 (patch) | |
| tree | 3330fb763c7f71d65761be0ef79a84b03bc14cc6 | |
| parent | 21fd3fae84ba79587233bc5b1493a82a44fcb947 (diff) | |
| download | chef-96a3ea931e21f2f579e4322457c5b88c0f18ba14.tar.gz | |
Bump version to 14.0.69 by Expeditorv14.0.69
| -rw-r--r-- | CHANGELOG.md | 7 | ||||
| -rw-r--r-- | Gemfile.lock | 10 | ||||
| -rw-r--r-- | VERSION | 2 | ||||
| -rw-r--r-- | chef-config/lib/chef-config/version.rb | 2 | ||||
| -rw-r--r-- | lib/chef/version.rb | 2 |
5 files changed, 12 insertions, 11 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 474091517b..85b9db1568 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,15 +1,16 @@ <!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ --> -<!-- latest_release 14.0.68 --> -## [v14.0.68](https://github.com/chef/chef/tree/v14.0.68) (2018-02-20) +<!-- latest_release 14.0.69 --> +## [v14.0.69](https://github.com/chef/chef/tree/v14.0.69) (2018-02-20) #### Merged Pull Requests -- make sure all proxy settings are dealt with [#6875](https://github.com/chef/chef/pull/6875) ([thommay](https://github.com/thommay)) +- updating paranoid to verify_host_key [#6869](https://github.com/chef/chef/pull/6869) ([tarcinil](https://github.com/tarcinil)) <!-- latest_release --> <!-- release_rollup since=13.7.16 --> ### Changes since 13.7.16 release #### Merged Pull Requests +- updating paranoid to verify_host_key [#6869](https://github.com/chef/chef/pull/6869) ([tarcinil](https://github.com/tarcinil)) <!-- 14.0.69 --> - make sure all proxy settings are dealt with [#6875](https://github.com/chef/chef/pull/6875) ([thommay](https://github.com/thommay)) <!-- 14.0.68 --> - fix chefstyle [#6874](https://github.com/chef/chef/pull/6874) ([thommay](https://github.com/thommay)) <!-- 14.0.67 --> - check identifier to resolve exported cookbooks by chef export [#6859](https://github.com/chef/chef/pull/6859) ([sawanoboly](https://github.com/sawanoboly)) <!-- 14.0.66 --> diff --git a/Gemfile.lock b/Gemfile.lock index d2e5f1c19b..bcee243d5e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -35,10 +35,10 @@ GIT PATH remote: . specs: - chef (14.0.68) + chef (14.0.69) addressable bundler (>= 1.10) - chef-config (= 14.0.68) + chef-config (= 14.0.69) chef-zero (>= 13.0) diff-lcs (~> 1.2, >= 1.2.4) erubis (~> 2.7) @@ -65,10 +65,10 @@ PATH specinfra (~> 2.10) syslog-logger (~> 1.6) uuidtools (~> 2.1.5) - chef (14.0.68-universal-mingw32) + chef (14.0.69-universal-mingw32) addressable bundler (>= 1.10) - chef-config (= 14.0.68) + chef-config (= 14.0.69) chef-zero (>= 13.0) diff-lcs (~> 1.2, >= 1.2.4) erubis (~> 2.7) @@ -110,7 +110,7 @@ PATH PATH remote: chef-config specs: - chef-config (14.0.68) + chef-config (14.0.69) addressable fuzzyurl mixlib-config (~> 2.0) @@ -1 +1 @@ -14.0.68
\ No newline at end of file +14.0.69
\ No newline at end of file diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb index 8e068981d9..2a6b521176 100644 --- a/chef-config/lib/chef-config/version.rb +++ b/chef-config/lib/chef-config/version.rb @@ -21,7 +21,7 @@ module ChefConfig CHEFCONFIG_ROOT = File.expand_path("../..", __FILE__) - VERSION = "14.0.68" + VERSION = "14.0.69" end # diff --git a/lib/chef/version.rb b/lib/chef/version.rb index d53483ff45..31803dbe97 100644 --- a/lib/chef/version.rb +++ b/lib/chef/version.rb @@ -23,7 +23,7 @@ require "chef/version_string" class Chef CHEF_ROOT = File.expand_path("../..", __FILE__) - VERSION = Chef::VersionString.new("14.0.68") + VERSION = Chef::VersionString.new("14.0.69") end # |