summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <eng-services-ops+chef-ci@chef.io>2017-12-01 17:48:44 +0000
committerChef Expeditor <eng-services-ops+chef-ci@chef.io>2017-12-01 17:48:44 +0000
commit7300eca603788048f95d0641f1110f8dcc049820 (patch)
treef73b13920bb1fd322a6ef1816407a5d1a3b90601
parentee70d58e52f89e7b7b1369fcd170946b54f41f4b (diff)
downloadchef-7300eca603788048f95d0641f1110f8dcc049820.tar.gz
Bump version to 13.6.24 by Expeditorv13.6.24
-rw-r--r--CHANGELOG.md6
-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, 10 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b504d9d675..3adff7a4e5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,9 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release unreleased -->
-## Unreleased
+<!-- latest_release 13.6.24 -->
+## [v13.6.24](https://github.com/chef/chef/tree/v13.6.24) (2017-12-01)
#### Merged Pull Requests
+- Knife SSH prefix option [#6590](https://github.com/chef/chef/pull/6590) ([mal](https://github.com/mal))
- Add Amazon Linux testing to PRs in Travis [#6611](https://github.com/chef/chef/pull/6611) ([tas50](https://github.com/tas50))
<!-- latest_release -->
@@ -10,6 +11,7 @@
### Changes since 13.6.4 release
#### Merged Pull Requests
+- Knife SSH prefix option [#6590](https://github.com/chef/chef/pull/6590) ([mal](https://github.com/mal)) <!-- 13.6.24 -->
- Add Amazon Linux testing to PRs in Travis [#6611](https://github.com/chef/chef/pull/6611) ([tas50](https://github.com/tas50)) <!-- 13.6.23 -->
- Hide sensitive properties in converge_if_changed. [#6576](https://github.com/chef/chef/pull/6576) ([cma-arnold](https://github.com/cma-arnold)) <!-- 13.6.23 -->
- Bump dependencies to pick up InSpec v1.46.2 [#6609](https://github.com/chef/chef/pull/6609) ([adamleff](https://github.com/adamleff)) <!-- 13.6.22 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 223620280e..9c201bab15 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -17,10 +17,10 @@ GIT
PATH
remote: .
specs:
- chef (13.6.23)
+ chef (13.6.24)
addressable
bundler (>= 1.10)
- chef-config (= 13.6.23)
+ chef-config (= 13.6.24)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -47,10 +47,10 @@ PATH
specinfra (~> 2.10)
syslog-logger (~> 1.6)
uuidtools (~> 2.1.5)
- chef (13.6.23-universal-mingw32)
+ chef (13.6.24-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 13.6.23)
+ chef-config (= 13.6.24)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -92,7 +92,7 @@ PATH
PATH
remote: chef-config
specs:
- chef-config (13.6.23)
+ chef-config (13.6.24)
addressable
fuzzyurl
mixlib-config (~> 2.0)
diff --git a/VERSION b/VERSION
index 587d3be91b..ff5973d43a 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-13.6.23 \ No newline at end of file
+13.6.24 \ 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 431af35dc0..5ea5f8601a 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 = "13.6.23"
+ VERSION = "13.6.24"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index dad128d9cb..4f31a8a47a 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("13.6.23")
+ VERSION = Chef::VersionString.new("13.6.24")
end
#