summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <eng-services-ops+chef-ci@chef.io>2017-07-27 15:33:22 +0000
committerChef Expeditor <eng-services-ops+chef-ci@chef.io>2017-07-27 15:33:22 +0000
commit041628e4bbdb541cb5011d564301bcda9804da4e (patch)
tree68d7f61e4f0957e22827e803446a66e47455bbc2
parent31a4bacb6de92710904dc4387a9928a06778660c (diff)
downloadchef-041628e4bbdb541cb5011d564301bcda9804da4e.tar.gz
Bump version to 13.3.28 by Chef Expeditorv13.3.28
-rw-r--r--CHANGELOG.md12
-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, 19 insertions, 11 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 99ac776044..a6d3050fc1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,15 @@
<!-- latest_release -->
+## [v13.3.28](https://github.com/chef/chef/tree/v13.3.28) (2017-07-27)
+
+#### Merged Pull Requests
+- Update Expeditor config to use new Merge and Artifact Actions [#6287](https://github.com/chef/chef/pull/6287) ([tduffield](https://github.com/tduffield))
<!-- latest_release -->
-<!-- release_rollup -->
+<!-- release_rollup since=13.2.20 -->
+### Changes since 13.2.20 release
+
+#### Merged Pull Requests
+- Update Expeditor config to use new Merge and Artifact Actions [#6287](https://github.com/chef/chef/pull/6287) ([tduffield](https://github.com/tduffield)) <!-- 13.3.28 -->
<!-- release_rollup -->
<!-- latest_stable_release -->
@@ -1390,4 +1398,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 7d0c115a09..f49bae24fa 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -17,10 +17,10 @@ GIT
PATH
remote: .
specs:
- chef (13.3.27)
+ chef (13.3.28)
addressable
bundler (>= 1.10)
- chef-config (= 13.3.27)
+ chef-config (= 13.3.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.3.27-universal-mingw32)
+ chef (13.3.28-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 13.3.27)
+ chef-config (= 13.3.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.3.27)
+ chef-config (13.3.28)
addressable
fuzzyurl
mixlib-config (~> 2.0)
@@ -312,7 +312,7 @@ GEM
simplecov-html (~> 0.10.0)
simplecov-html (0.10.1)
slop (3.6.0)
- specinfra (2.69.0)
+ specinfra (2.70.0)
net-scp
net-ssh (>= 2.7, < 5.0)
net-telnet
diff --git a/VERSION b/VERSION
index 07f5332cc0..f7540acd6d 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-13.3.27 \ No newline at end of file
+13.3.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 7579a50553..11f47af5d0 100644
--- a/chef-config/lib/chef-config/version.rb
+++ b/chef-config/lib/chef-config/version.rb
@@ -20,7 +20,7 @@
module ChefConfig
CHEFCONFIG_ROOT = File.expand_path("../..", __FILE__)
- VERSION = "13.3.27"
+ VERSION = "13.3.28"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index f8f3ef0858..657b79cd71 100644
--- a/lib/chef/version.rb
+++ b/lib/chef/version.rb
@@ -22,7 +22,7 @@ require "chef/version_string"
class Chef
CHEF_ROOT = File.expand_path("../..", __FILE__)
- VERSION = Chef::VersionString.new("13.3.27")
+ VERSION = Chef::VersionString.new("13.3.28")
end
#