summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <eng-services-ops+chef-ci@chef.io>2017-10-27 06:49:43 +0000
committerChef Expeditor <eng-services-ops+chef-ci@chef.io>2017-10-27 06:49:43 +0000
commitfb1c22392426ea3b45f30f527ad065eb7691a001 (patch)
treec4a8524c5221c2ce8c67e198118962ecd224253d
parentda5bc194fc0c90d45836017a977a23c25a2b2236 (diff)
downloadchef-fb1c22392426ea3b45f30f527ad065eb7691a001.tar.gz
Bump version to 13.5.28 by Expeditorv13.5.28
-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 508949667e..e30a3748dd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 13.5.27 -->
-## [v13.5.27](https://github.com/chef/chef/tree/v13.5.27) (2017-10-26)
+<!-- latest_release 13.5.28 -->
+## [v13.5.28](https://github.com/chef/chef/tree/v13.5.28) (2017-10-27)
#### Merged Pull Requests
-- Use the latest libxml2, libxslt, libyaml, and openssl [#6520](https://github.com/chef/chef/pull/6520) ([tas50](https://github.com/tas50))
+- Pull in the latest libiconv and nokogiri [#6532](https://github.com/chef/chef/pull/6532) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup since=13.5.3 -->
### Changes since 13.5.3 release
#### Merged Pull Requests
+- Pull in the latest libiconv and nokogiri [#6532](https://github.com/chef/chef/pull/6532) ([tas50](https://github.com/tas50)) <!-- 13.5.28 -->
- Use the latest libxml2, libxslt, libyaml, and openssl [#6520](https://github.com/chef/chef/pull/6520) ([tas50](https://github.com/tas50)) <!-- 13.5.27 -->
- Include Ohai 13.6 [#6521](https://github.com/chef/chef/pull/6521) ([btm](https://github.com/btm)) <!-- 13.5.26 -->
- Deprecate the deploy resource and family [#6468](https://github.com/chef/chef/pull/6468) ([coderanger](https://github.com/coderanger)) <!-- 13.5.25 -->
@@ -1622,4 +1623,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 93737af17b..a791208767 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -17,10 +17,10 @@ GIT
PATH
remote: .
specs:
- chef (13.5.27)
+ chef (13.5.28)
addressable
bundler (>= 1.10)
- chef-config (= 13.5.27)
+ chef-config (= 13.5.28)
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.5.27-universal-mingw32)
+ chef (13.5.28-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 13.5.27)
+ chef-config (= 13.5.28)
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.5.27)
+ chef-config (13.5.28)
addressable
fuzzyurl
mixlib-config (~> 2.0)
diff --git a/VERSION b/VERSION
index b73f2a491d..da9194892e 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-13.5.27 \ No newline at end of file
+13.5.28 \ 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 7623dfc5a3..bb384ef1ee 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.5.27"
+ VERSION = "13.5.28"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 1978c11ab8..99f9b178e7 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.5.27")
+ VERSION = Chef::VersionString.new("13.5.28")
end
#