summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-01-22 15:48:16 +0000
committerChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-01-22 15:48:16 +0000
commitfc84ad29bf1a365e343b5bb3d4206663269420cc (patch)
treea9a58ce5b5261b89c9fd568706900dafdd81a474
parent80b52b6048b6e1e047a940f7e21a29e76497ea9b (diff)
downloadchef-fc84ad29bf1a365e343b5bb3d4206663269420cc.tar.gz
Bump version to 14.0.6 by Expeditorv14.0.6
-rw-r--r--CHANGELOG.md7
-rw-r--r--Gemfile.lock10
-rw-r--r--VERSION2
-rw-r--r--chef-config/lib/chef-config/version.rb2
-rw-r--r--lib/chef/version.rb2
5 files changed, 12 insertions, 11 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d53f60963c..5c0c1866a9 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.5 -->
-## [v14.0.5](https://github.com/chef/chef/tree/v14.0.5) (2018-01-22)
+<!-- latest_release 14.0.6 -->
+## [v14.0.6](https://github.com/chef/chef/tree/v14.0.6) (2018-01-22)
#### 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))
+- Remove deprecated knife ssh --identity-file option [#6445](https://github.com/chef/chef/pull/6445) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup since=13.6.4 -->
### Changes since 13.6.4 release
#### Merged Pull Requests
+- Remove deprecated knife ssh --identity-file option [#6445](https://github.com/chef/chef/pull/6445) ([tas50](https://github.com/tas50)) <!-- 14.0.6 -->
- 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 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 4fd270ea33..bc5ccda378 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -35,10 +35,10 @@ GIT
PATH
remote: .
specs:
- chef (14.0.5)
+ chef (14.0.6)
addressable
bundler (>= 1.10)
- chef-config (= 14.0.5)
+ chef-config (= 14.0.6)
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.5-universal-mingw32)
+ chef (14.0.6-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 14.0.5)
+ chef-config (= 14.0.6)
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.5)
+ chef-config (14.0.6)
addressable
fuzzyurl
mixlib-config (~> 2.0)
diff --git a/VERSION b/VERSION
index 6dbeddf9e3..85f5c201fc 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.0.5 \ No newline at end of file
+14.0.6 \ 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 496fce49eb..dcdcb34156 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.5"
+ VERSION = "14.0.6"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index db875a6c60..38eb60069a 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.5")
+ VERSION = Chef::VersionString.new("14.0.6")
end
#