summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <eng-services-ops+chef-ci@chef.io>2017-09-08 11:58:03 +0000
committerChef Expeditor <eng-services-ops+chef-ci@chef.io>2017-09-08 11:58:03 +0000
commit85aee950564df6d373c6f67beb0fe33dfab3f613 (patch)
tree6950f59475f160e9175a6d8caf77e04e07b649a3
parent5cd0ef1036b0fc82b6385655fee16176c506aadb (diff)
downloadchef-85aee950564df6d373c6f67beb0fe33dfab3f613.tar.gz
Bump version to 13.4.17 by Chef Expeditorv13.4.17
-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 1478907163..26efd57a52 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,9 +1,9 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 13.4.16 -->
-## [v13.4.16](https://github.com/chef/chef/tree/v13.4.16) (2017-09-08)
+<!-- latest_release 13.4.17 -->
+## [v13.4.17](https://github.com/chef/chef/tree/v13.4.17) (2017-09-08)
#### Merged Pull Requests
-- Add support for specifying ETHTOOL_OPTS [#6384](https://github.com/chef/chef/pull/6384) ([tomdoherty](https://github.com/tomdoherty))
+- Ensure we quote ETHTOOL/BONDING_OPTS [#6385](https://github.com/chef/chef/pull/6385) ([tomdoherty](https://github.com/tomdoherty))
<!-- latest_release -->
<!-- release_rollup since=13.3.42 -->
@@ -13,6 +13,7 @@
- Pass json configuration to ShellSession class [#6314](https://github.com/chef/chef/pull/6314) ([btm](https://github.com/btm)) <!-- 13.3.47 -->
#### Merged Pull Requests
+- Ensure we quote ETHTOOL/BONDING_OPTS [#6385](https://github.com/chef/chef/pull/6385) ([tomdoherty](https://github.com/tomdoherty)) <!-- 13.4.17 -->
- Add support for specifying ETHTOOL_OPTS [#6384](https://github.com/chef/chef/pull/6384) ([tomdoherty](https://github.com/tomdoherty)) <!-- 13.4.16 -->
- update release notes for 13.4 [#6381](https://github.com/chef/chef/pull/6381) ([thommay](https://github.com/thommay)) <!-- 13.4.15 -->
- Launchd should not load launchagents as root. [#6353](https://github.com/chef/chef/pull/6353) ([mikedodge04](https://github.com/mikedodge04)) <!-- 13.4.14 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 32d8806f97..0246e28b40 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -17,10 +17,10 @@ GIT
PATH
remote: .
specs:
- chef (13.4.16)
+ chef (13.4.17)
addressable
bundler (>= 1.10)
- chef-config (= 13.4.16)
+ chef-config (= 13.4.17)
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.4.16-universal-mingw32)
+ chef (13.4.17-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 13.4.16)
+ chef-config (= 13.4.17)
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.4.16)
+ chef-config (13.4.17)
addressable
fuzzyurl
mixlib-config (~> 2.0)
diff --git a/VERSION b/VERSION
index ee09440dd6..7b7e883aed 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-13.4.16 \ No newline at end of file
+13.4.17 \ 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 40373cd432..c632f23852 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.4.16"
+ VERSION = "13.4.17"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index eb0ca4245a..020659f3d6 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.4.16")
+ VERSION = Chef::VersionString.new("13.4.17")
end
#