summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <eng-services-ops+chef-ci@chef.io>2017-09-08 00:14:36 +0000
committerChef Expeditor <eng-services-ops+chef-ci@chef.io>2017-09-08 00:14:36 +0000
commita17a5baa70b44454b5f6b05fa930966fbf5c224e (patch)
treeb9715a0a9b448ffc54f4ba8f6b81fb77aada096a
parent0ed70255ea7e7163ca6284ac483fb1bc5f031aa1 (diff)
downloadchef-a17a5baa70b44454b5f6b05fa930966fbf5c224e.tar.gz
Bump version to 13.4.16 by Chef Expeditorv13.4.16
-rw-r--r--CHANGELOG.md9
-rw-r--r--Gemfile.lock12
-rw-r--r--VERSION2
-rw-r--r--chef-config/lib/chef-config/version.rb2
-rw-r--r--lib/chef/version.rb2
5 files changed, 14 insertions, 13 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index ab77765ed3..1478907163 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.15 -->
-## [v13.4.15](https://github.com/chef/chef/tree/v13.4.15) (2017-09-06)
+<!-- latest_release 13.4.16 -->
+## [v13.4.16](https://github.com/chef/chef/tree/v13.4.16) (2017-09-08)
#### Merged Pull Requests
-- update release notes for 13.4 [#6381](https://github.com/chef/chef/pull/6381) ([thommay](https://github.com/thommay))
+- Add support for specifying ETHTOOL_OPTS [#6384](https://github.com/chef/chef/pull/6384) ([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
+- 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 -->
- Alternate user local logon authentication for remote_file resource [#5832](https://github.com/chef/chef/pull/5832) ([NimishaS](https://github.com/NimishaS)) <!-- 13.4.13 -->
@@ -1582,4 +1583,4 @@ of partial templates.
* Fixed a bug where nested resources that inherited from Resource::LWRPBase
would not share the same actions/default_action as their parent
* Raise error if a guard_interpreter is specified and a block is passed to a guard (conditional)
-* Allow specifying a guard_interpreter after a conditional on a resource (Fixes #1943)
+* Allow specifying a guard_interpreter after a conditional on a resource (Fixes #1943) \ No newline at end of file
diff --git a/Gemfile.lock b/Gemfile.lock
index 1d4b5e0ea2..32d8806f97 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -17,10 +17,10 @@ GIT
PATH
remote: .
specs:
- chef (13.4.15)
+ chef (13.4.16)
addressable
bundler (>= 1.10)
- chef-config (= 13.4.15)
+ chef-config (= 13.4.16)
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.15-universal-mingw32)
+ chef (13.4.16-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 13.4.15)
+ chef-config (= 13.4.16)
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.15)
+ chef-config (13.4.16)
addressable
fuzzyurl
mixlib-config (~> 2.0)
@@ -312,7 +312,7 @@ GEM
simplecov-html (~> 0.10.0)
simplecov-html (0.10.2)
slop (3.6.0)
- specinfra (2.71.1)
+ specinfra (2.71.2)
net-scp
net-ssh (>= 2.7, < 5.0)
net-telnet
diff --git a/VERSION b/VERSION
index 5fe4debfe4..ee09440dd6 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-13.4.15 \ No newline at end of file
+13.4.16 \ 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 54b37ff892..40373cd432 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.15"
+ VERSION = "13.4.16"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 6ccb1be93d..eb0ca4245a 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.15")
+ VERSION = Chef::VersionString.new("13.4.16")
end
#