summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <eng-services-ops+chef-ci@chef.io>2017-09-26 07:27:26 +0000
committerChef Expeditor <eng-services-ops+chef-ci@chef.io>2017-09-26 07:27:26 +0000
commitc4af66766f970b915a5bd2cd65308936082202a7 (patch)
tree333d46c75bcfc4027f81d52a2714dce3d7fe2c30
parenta2e7a5e917d26abf8073a94c3e7fb32af818dee2 (diff)
downloadchef-c4af66766f970b915a5bd2cd65308936082202a7.tar.gz
Bump version to 13.4.34 by Chef Expeditorv13.4.34
-rw-r--r--CHANGELOG.md5
-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, 12 insertions, 11 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 04e681fb36..390d72c93d 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.33 -->
+<!-- latest_release 13.4.34 -->
## [v13.4.33](https://github.com/chef/chef/tree/v13.4.33) (2017-09-25)
#### Merged Pull Requests
-- update expeditor labels [#6432](https://github.com/chef/chef/pull/6432) ([thommay](https://github.com/thommay))
+- Update dependencies to pull in InSpec v1.39.1 [#6440](https://github.com/chef/chef/pull/6440) ([adamleff](https://github.com/adamleff))
<!-- latest_release -->
<!-- release_rollup since=13.4.24 -->
### Changes since 13.4.24 release
#### Merged Pull Requests
+- Update dependencies to pull in InSpec v1.39.1 [#6440](https://github.com/chef/chef/pull/6440) ([adamleff](https://github.com/adamleff)) <!-- 13.4.34 -->
- update expeditor labels [#6432](https://github.com/chef/chef/pull/6432) ([thommay](https://github.com/thommay)) <!-- 13.4.33 -->
- Fix Knife search ID only option to actually filter result set [#6438](https://github.com/chef/chef/pull/6438) ([dimsh99](https://github.com/dimsh99)) <!-- 13.4.32 -->
- Add throttle and metalink options to yum_repository [#6431](https://github.com/chef/chef/pull/6431) ([tas50](https://github.com/tas50)) <!-- 13.4.31 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index ae3c0b9099..8f740c9154 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -17,10 +17,10 @@ GIT
PATH
remote: .
specs:
- chef (13.4.33)
+ chef (13.4.34)
addressable
bundler (>= 1.10)
- chef-config (= 13.4.33)
+ chef-config (= 13.4.34)
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.33-universal-mingw32)
+ chef (13.4.34-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 13.4.33)
+ chef-config (= 13.4.34)
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.33)
+ chef-config (13.4.34)
addressable
fuzzyurl
mixlib-config (~> 2.0)
@@ -312,7 +312,7 @@ GEM
simplecov-html (~> 0.10.0)
simplecov-html (0.10.2)
slop (3.6.0)
- specinfra (2.71.3)
+ specinfra (2.72.0)
net-scp
net-ssh (>= 2.7, < 5.0)
net-telnet
diff --git a/VERSION b/VERSION
index c402902cc8..1a3b4f5e88 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-13.4.33 \ No newline at end of file
+13.4.34 \ 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 509d76cf8c..ee5b50fe10 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.33"
+ VERSION = "13.4.34"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index e30285d620..1fe95052a3 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.33")
+ VERSION = Chef::VersionString.new("13.4.34")
end
#