summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <eng-services-ops+chef-ci@chef.io>2017-08-11 15:26:03 +0000
committerChef Expeditor <eng-services-ops+chef-ci@chef.io>2017-08-11 15:26:03 +0000
commitf71c0a1adb8ff792a7eb7f826fff686b38135fc8 (patch)
treea85490e6b41d7959d5530f417c65aedd2b43faa5
parent6b430b1e2873feccdd21b8da7fb5f982dccb756b (diff)
downloadchef-f71c0a1adb8ff792a7eb7f826fff686b38135fc8.tar.gz
Bump version to 13.3.42 by Chef Expeditorv13.3.42
-rw-r--r--CHANGELOG.md7
-rw-r--r--Gemfile.lock11
-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, 12 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2bb823d7f8..b6c0a759bb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,14 +1,15 @@
-<!-- latest_release 13.3.41 -->
-## [v13.3.41](https://github.com/chef/chef/tree/v13.3.41) (2017-08-11)
+<!-- latest_release 13.3.42 -->
+## [v13.3.42](https://github.com/chef/chef/tree/v13.3.42) (2017-08-11)
#### Merged Pull Requests
-- README improvement for Chef beginner. [#6297](https://github.com/chef/chef/pull/6297) ([takaya-fuj19](https://github.com/takaya-fuj19))
+- Bump InSpec to v1.33.1 [#6324](https://github.com/chef/chef/pull/6324) ([adamleff](https://github.com/adamleff))
<!-- latest_release -->
<!-- release_rollup since=13.2.20 -->
### Changes since 13.2.20 release
#### Merged Pull Requests
+- Bump InSpec to v1.33.1 [#6324](https://github.com/chef/chef/pull/6324) ([adamleff](https://github.com/adamleff)) <!-- 13.3.42 -->
- README improvement for Chef beginner. [#6297](https://github.com/chef/chef/pull/6297) ([takaya-fuj19](https://github.com/takaya-fuj19)) <!-- 13.3.41 -->
- Maintain compat with old zypper_repo resource used in cookbooks [#6318](https://github.com/chef/chef/pull/6318) ([tas50](https://github.com/tas50)) <!-- 13.3.40 -->
- Pull in Ohai 13.3 [#6319](https://github.com/chef/chef/pull/6319) ([tas50](https://github.com/tas50)) <!-- 13.3.39 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 6f77aa8b6c..cf5276413a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -17,10 +17,10 @@ GIT
PATH
remote: .
specs:
- chef (13.3.41)
+ chef (13.3.42)
addressable
bundler (>= 1.10)
- chef-config (= 13.3.41)
+ chef-config (= 13.3.42)
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.41-universal-mingw32)
+ chef (13.3.42-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 13.3.41)
+ chef-config (= 13.3.42)
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.41)
+ chef-config (13.3.42)
addressable
fuzzyurl
mixlib-config (~> 2.0)
@@ -256,7 +256,6 @@ GEM
pry-stack_explorer (0.4.9.2)
binding_of_caller (>= 0.7)
pry (>= 0.9.11)
- public_suffix (2.0.5)
pusher-client (0.6.2)
json
websocket (~> 1.0)
diff --git a/VERSION b/VERSION
index 0fd04cd9ff..c39c8b62d4 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-13.3.41 \ No newline at end of file
+13.3.42 \ 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 74114d9ef7..36442205b3 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.41"
+ VERSION = "13.3.42"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 71becff171..05ee00a869 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.41")
+ VERSION = Chef::VersionString.new("13.3.42")
end
#