diff options
author | Chef Expeditor <eng-services-ops+chef-ci@chef.io> | 2018-01-22 15:45:11 +0000 |
---|---|---|
committer | Chef Expeditor <eng-services-ops+chef-ci@chef.io> | 2018-01-22 15:45:11 +0000 |
commit | b356460e1affea08d0fac0dde18b57bdbb01b508 (patch) | |
tree | 0122b58749592ff9ec0a94991942961f70df07eb | |
parent | 9ef5c2d239b2501cad5fc01bdfc9d617ddef5430 (diff) | |
download | chef-b356460e1affea08d0fac0dde18b57bdbb01b508.tar.gz |
Bump version to 14.0.5 by Expeditorv14.0.5
-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 5ff88a5e81..d53f60963c 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.4 --> -## [v14.0.4](https://github.com/chef/chef/tree/v14.0.4) (2018-01-22) +<!-- latest_release 14.0.5 --> +## [v14.0.5](https://github.com/chef/chef/tree/v14.0.5) (2018-01-22) #### Merged Pull Requests -- Chef 14: Remove deprecated knife ssh csshx command [#6444](https://github.com/chef/chef/pull/6444) ([tas50](https://github.com/tas50)) +- Add dhparam, rsa_private_key and rsa_public_key resources [#6736](https://github.com/chef/chef/pull/6736) ([tas50](https://github.com/tas50)) <!-- latest_release --> <!-- release_rollup since=13.6.4 --> ### Changes since 13.6.4 release #### Merged Pull Requests +- Add dhparam, rsa_private_key and rsa_public_key resources [#6736](https://github.com/chef/chef/pull/6736) ([tas50](https://github.com/tas50)) <!-- 14.0.5 --> - Chef 14: Remove deprecated knife ssh csshx command [#6444](https://github.com/chef/chef/pull/6444) ([tas50](https://github.com/tas50)) <!-- 14.0.4 --> - Remove deprecated -r option for Solo mode [#6719](https://github.com/chef/chef/pull/6719) ([tas50](https://github.com/tas50)) <!-- 14.0.3 --> - Remove knife index rebuild command that requires Chef < 11 [#6728](https://github.com/chef/chef/pull/6728) ([tas50](https://github.com/tas50)) <!-- 14.0.2 --> diff --git a/Gemfile.lock b/Gemfile.lock index ea3bfa4cfa..4fd270ea33 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -35,10 +35,10 @@ GIT PATH remote: . specs: - chef (14.0.4) + chef (14.0.5) addressable bundler (>= 1.10) - chef-config (= 14.0.4) + chef-config (= 14.0.5) 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.4-universal-mingw32) + chef (14.0.5-universal-mingw32) addressable bundler (>= 1.10) - chef-config (= 14.0.4) + chef-config (= 14.0.5) 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.4) + chef-config (14.0.5) addressable fuzzyurl mixlib-config (~> 2.0) @@ -1 +1 @@ -14.0.4
\ No newline at end of file +14.0.5
\ 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 03af119fbd..496fce49eb 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.4" + VERSION = "14.0.5" end # diff --git a/lib/chef/version.rb b/lib/chef/version.rb index 3695219ff7..db875a6c60 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.4") + VERSION = Chef::VersionString.new("14.0.5") end # |