summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <eng-services-ops+chef-ci@chef.io>2017-09-22 09:14:24 +0000
committerChef Expeditor <eng-services-ops+chef-ci@chef.io>2017-09-22 09:14:24 +0000
commit85957c76e2981fca06c9377a1363a79e1277199d (patch)
tree0220fdc10d8883d6065ae02ead069ba44a98a533
parentb4ccc561837ce66738b5306b0829d65c86a92dca (diff)
downloadchef-85957c76e2981fca06c9377a1363a79e1277199d.tar.gz
Bump version to 13.4.31 by Chef Expeditorv13.4.31
-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 adf59f5e20..b1b884e325 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 13.4.30 -->
-## [v13.4.30](https://github.com/chef/chef/tree/v13.4.30) (2017-09-18)
+<!-- latest_release 13.4.31 -->
+## [v13.4.31](https://github.com/chef/chef/tree/v13.4.31) (2017-09-22)
#### Merged Pull Requests
-- Update dokken integration testing: dokken images, updated cookbook, debian 9 [#6414](https://github.com/chef/chef/pull/6414) ([tas50](https://github.com/tas50))
+- Add throttle and metalink options to yum_repository [#6431](https://github.com/chef/chef/pull/6431) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup since=13.4.24 -->
### Changes since 13.4.24 release
#### Merged Pull Requests
+- Add throttle and metalink options to yum_repository [#6431](https://github.com/chef/chef/pull/6431) ([tas50](https://github.com/tas50)) <!-- 13.4.31 -->
- Update dokken integration testing: dokken images, updated cookbook, debian 9 [#6414](https://github.com/chef/chef/pull/6414) ([tas50](https://github.com/tas50)) <!-- 13.4.30 -->
- Don&#39;t catch SIGCHLD from dnf_helper.py [#6416](https://github.com/chef/chef/pull/6416) ([nemith](https://github.com/nemith)) <!-- 13.4.29 -->
- Open apt resources up to prevent breaking change [#6417](https://github.com/chef/chef/pull/6417) ([tas50](https://github.com/tas50)) <!-- 13.4.28 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 0161561ef8..675c839831 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -17,10 +17,10 @@ GIT
PATH
remote: .
specs:
- chef (13.4.30)
+ chef (13.4.31)
addressable
bundler (>= 1.10)
- chef-config (= 13.4.30)
+ chef-config (= 13.4.31)
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.4.30-universal-mingw32)
+ chef (13.4.31-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 13.4.30)
+ chef-config (= 13.4.31)
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.4.30)
+ chef-config (13.4.31)
addressable
fuzzyurl
mixlib-config (~> 2.0)
diff --git a/VERSION b/VERSION
index ff27ec5ef5..d4ecb5fcfb 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-13.4.30 \ No newline at end of file
+13.4.31 \ 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 3bcd2265cf..cca21eeec4 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.4.30"
+ VERSION = "13.4.31"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index e4dc4a75d1..cb07f2ff31 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.4.30")
+ VERSION = Chef::VersionString.new("13.4.31")
end
#