summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-01-19 10:57:27 +0000
committerChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-01-19 10:57:27 +0000
commit3b6800b84eeb7bd8f84a748ac6734104fdac04b4 (patch)
treeff2eadc79bc27ae368426d4a3618cbac627baa67
parentf98d9f2684959e22db84121f707cf21361811cc4 (diff)
downloadchef-3b6800b84eeb7bd8f84a748ac6734104fdac04b4.tar.gz
Bump version to 13.7.16 by Expeditorv13.7.16
-rw-r--r--CHANGELOG.md9
-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, 13 insertions, 12 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1b229cac26..0576cb439d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 13.7.15 -->
-## [v13.7.15](https://github.com/chef/chef/tree/v13.7.15) (2018-01-19)
+<!-- latest_release 13.7.16 -->
+## [v13.7.16](https://github.com/chef/chef/tree/v13.7.16) (2018-01-19)
#### Merged Pull Requests
-- Revert deprecation of use_inline_resources [#6754](https://github.com/chef/chef/pull/6754) ([tas50](https://github.com/tas50))
+- Update release notes for 13.7 [#6751](https://github.com/chef/chef/pull/6751) ([thommay](https://github.com/thommay))
<!-- latest_release -->
<!-- release_rollup since=13.6.4 -->
### Changes since 13.6.4 release
#### Merged Pull Requests
+- Update release notes for 13.7 [#6751](https://github.com/chef/chef/pull/6751) ([thommay](https://github.com/thommay)) <!-- 13.7.16 -->
- Revert deprecation of use_inline_resources [#6754](https://github.com/chef/chef/pull/6754) ([tas50](https://github.com/tas50)) <!-- 13.7.15 -->
- fix double-logging bug [#6752](https://github.com/chef/chef/pull/6752) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 13.7.14 -->
- Add a warning that Chef 11 server support in knife user is deprecated [#6725](https://github.com/chef/chef/pull/6725) ([tas50](https://github.com/tas50)) <!-- 13.7.13 -->
@@ -1706,4 +1707,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 a0c2a5eb40..17ff1eb48a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -17,10 +17,10 @@ GIT
PATH
remote: .
specs:
- chef (13.7.15)
+ chef (13.7.16)
addressable
bundler (>= 1.10)
- chef-config (= 13.7.15)
+ chef-config (= 13.7.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.7.15-universal-mingw32)
+ chef (13.7.16-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 13.7.15)
+ chef-config (= 13.7.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.7.15)
+ chef-config (13.7.16)
addressable
fuzzyurl
mixlib-config (~> 2.0)
diff --git a/VERSION b/VERSION
index e994768bcf..2ad6de81a4 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-13.7.15 \ No newline at end of file
+13.7.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 fdc0c74d88..0c7625ae92 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.7.15"
+ VERSION = "13.7.16"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 7d88a8cc0c..9bfe3554ef 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.7.15")
+ VERSION = Chef::VersionString.new("13.7.16")
end
#