summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-09-11 04:03:24 +0000
committerChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-09-11 04:03:24 +0000
commit7eb2bfefbc4b138b5b8ce19239ebf70f83de8ca9 (patch)
tree06222b8cdf9c26d41dc05f379753052c91bd3a43
parent38632e556c8a5c4e97982721fd1eba9a7544aab6 (diff)
downloadchef-7eb2bfefbc4b138b5b8ce19239ebf70f83de8ca9.tar.gz
Bump version to 14.5.11 by Chef Expeditorv14.5.11
Obvious fix; these changes are the result of automation not creative thinking.
-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 773cac4769..67363b5f8c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 14.5.10 -->
-## [v14.5.10](https://github.com/chef/chef/tree/v14.5.10) (2018-09-10)
+<!-- latest_release 14.5.11 -->
+## [v14.5.11](https://github.com/chef/chef/tree/v14.5.11) (2018-09-11)
#### Merged Pull Requests
-- Update expeditor config to use subscriptions [#7632](https://github.com/chef/chef/pull/7632) ([tas50](https://github.com/tas50))
+- paludis_package: Make sure timeout property is an Integer [#7625](https://github.com/chef/chef/pull/7625) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup since=14.4.56 -->
### Changes since 14.4.56 release
#### Merged Pull Requests
+- paludis_package: Make sure timeout property is an Integer [#7625](https://github.com/chef/chef/pull/7625) ([tas50](https://github.com/tas50)) <!-- 14.5.11 -->
- Update expeditor config to use subscriptions [#7632](https://github.com/chef/chef/pull/7632) ([tas50](https://github.com/tas50)) <!-- 14.5.10 -->
- Fix remote_directory does not obey removal of file specificity [#7551](https://github.com/chef/chef/pull/7551) ([thechile](https://github.com/thechile)) <!-- 14.5.9 -->
- Add required properties to the resource inspector output [#7631](https://github.com/chef/chef/pull/7631) ([tas50](https://github.com/tas50)) <!-- 14.5.8 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index a41dfc82c4..dd84760aa8 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -9,10 +9,10 @@ GIT
PATH
remote: .
specs:
- chef (14.5.10)
+ chef (14.5.11)
addressable
bundler (>= 1.10)
- chef-config (= 14.5.10)
+ chef-config (= 14.5.11)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -40,10 +40,10 @@ PATH
specinfra (~> 2.10)
syslog-logger (~> 1.6)
uuidtools (~> 2.1.5)
- chef (14.5.10-universal-mingw32)
+ chef (14.5.11-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 14.5.10)
+ chef-config (= 14.5.11)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -86,7 +86,7 @@ PATH
PATH
remote: chef-config
specs:
- chef-config (14.5.10)
+ chef-config (14.5.11)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 3.0)
diff --git a/VERSION b/VERSION
index abd4a00ca8..2bd8d20411 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.5.10 \ No newline at end of file
+14.5.11 \ 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 ef2fb34e20..624bfcb519 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 = "14.5.10".freeze
+ VERSION = "14.5.11".freeze
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 30bcab0c48..dc8b9f15fc 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("14.5.10")
+ VERSION = Chef::VersionString.new("14.5.11")
end
#