summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <eng-services-ops+chef-ci@chef.io>2017-10-06 19:53:27 +0000
committerChef Expeditor <eng-services-ops+chef-ci@chef.io>2017-10-06 19:53:27 +0000
commitd0701874085d770a7390cfe03e08f977867d2758 (patch)
tree1ce36bc31f98862a35d8a1590e3b54064f0ede08
parentead8e1150015f2bd4dcaee9c68644bc579560990 (diff)
downloadchef-d0701874085d770a7390cfe03e08f977867d2758.tar.gz
Bump version to 13.5.14 by Chef Expeditorv13.5.14
-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 46a1d25663..2587c17420 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.13 -->
-## [v13.5.13](https://github.com/chef/chef/tree/v13.5.13) (2017-10-06)
+<!-- latest_release 13.5.14 -->
+## [v13.5.14](https://github.com/chef/chef/tree/v13.5.14) (2017-10-06)
#### Merged Pull Requests
-- Remove cookbook_artifacts from CHEF_11_OSS_STATIC_OBJECTS [#6478](https://github.com/chef/chef/pull/6478) ([itmustbejj](https://github.com/itmustbejj))
+- Add allow_downgrade to zypper_package resource [#6476](https://github.com/chef/chef/pull/6476) ([yeoldegrove](https://github.com/yeoldegrove))
<!-- latest_release -->
<!-- release_rollup since=13.5.3 -->
### Changes since 13.5.3 release
#### Merged Pull Requests
+- Add allow_downgrade to zypper_package resource [#6476](https://github.com/chef/chef/pull/6476) ([yeoldegrove](https://github.com/yeoldegrove)) <!-- 13.5.14 -->
- Remove cookbook_artifacts from CHEF_11_OSS_STATIC_OBJECTS [#6478](https://github.com/chef/chef/pull/6478) ([itmustbejj](https://github.com/itmustbejj)) <!-- 13.5.13 -->
- Prevent creation of data bags named node, role, client or environment [#6469](https://github.com/chef/chef/pull/6469) ([sanditiffin](https://github.com/sanditiffin)) <!-- 13.5.12 -->
- dnf_resource: be more specific for rhel packages [#6435](https://github.com/chef/chef/pull/6435) ([NaomiReeves](https://github.com/NaomiReeves)) <!-- 13.5.11 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index a4433b30b2..bfaffe446d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -17,10 +17,10 @@ GIT
PATH
remote: .
specs:
- chef (13.5.13)
+ chef (13.5.14)
addressable
bundler (>= 1.10)
- chef-config (= 13.5.13)
+ chef-config (= 13.5.14)
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.13-universal-mingw32)
+ chef (13.5.14-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 13.5.13)
+ chef-config (= 13.5.14)
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.13)
+ chef-config (13.5.14)
addressable
fuzzyurl
mixlib-config (~> 2.0)
diff --git a/VERSION b/VERSION
index 2d8d5728af..f02307599c 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-13.5.13 \ No newline at end of file
+13.5.14 \ 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 411ed5cd88..53c2545e3b 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.13"
+ VERSION = "13.5.14"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 909002ef4c..21c443aa8e 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.13")
+ VERSION = Chef::VersionString.new("13.5.14")
end
#