summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-03-27 01:44:02 +0000
committerChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-03-27 01:44:02 +0000
commit29dd182d8be15234ed95bd601fcec82715b5769c (patch)
tree50634fe58fa051e9aff385adc7d86467f7a9884a
parent9c0b576af2803ffcec616d031594c40643d81749 (diff)
downloadchef-29dd182d8be15234ed95bd601fcec82715b5769c.tar.gz
Bump version to 14.0.167 by Expeditorv14.0.167
-rw-r--r--CHANGELOG.md7
-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, 13 insertions, 12 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 86518b5ced..661823bb9b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 14.0.166 -->
-## [v14.0.166](https://github.com/chef/chef/tree/v14.0.166) (2018-03-26)
+<!-- latest_release 14.0.167 -->
+## [v14.0.167](https://github.com/chef/chef/tree/v14.0.167) (2018-03-27)
#### Merged Pull Requests
-- RFC-102: Deprecation warning in resources [#7050](https://github.com/chef/chef/pull/7050) ([thommay](https://github.com/thommay))
+- Ship InSpec 2 [#7051](https://github.com/chef/chef/pull/7051) ([thommay](https://github.com/thommay))
<!-- latest_release -->
<!-- release_rollup since=13.8.5 -->
### Changes since 13.8.5 release
#### Merged Pull Requests
+- Ship InSpec 2 [#7051](https://github.com/chef/chef/pull/7051) ([thommay](https://github.com/thommay)) <!-- 14.0.167 -->
- RFC-102: Deprecation warning in resources [#7050](https://github.com/chef/chef/pull/7050) ([thommay](https://github.com/thommay)) <!-- 14.0.166 -->
- Ensure that we pass the correct options to mount [#7030](https://github.com/chef/chef/pull/7030) ([thommay](https://github.com/thommay)) <!-- 14.0.165 -->
- Parser 2.5.0.4 was yanked [#7055](https://github.com/chef/chef/pull/7055) ([tas50](https://github.com/tas50)) <!-- 14.0.164 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 0955923e14..2dc4faf802 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -15,10 +15,10 @@ GIT
PATH
remote: .
specs:
- chef (14.0.166)
+ chef (14.0.167)
addressable
bundler (>= 1.10)
- chef-config (= 14.0.166)
+ chef-config (= 14.0.167)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -45,10 +45,10 @@ PATH
specinfra (~> 2.10)
syslog-logger (~> 1.6)
uuidtools (~> 2.1.5)
- chef (14.0.166-universal-mingw32)
+ chef (14.0.167-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 14.0.166)
+ chef-config (= 14.0.167)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -90,7 +90,7 @@ PATH
PATH
remote: chef-config
specs:
- chef-config (14.0.166)
+ chef-config (14.0.167)
addressable
fuzzyurl
mixlib-config (~> 2.0)
@@ -251,7 +251,7 @@ GEM
nori (2.6.0)
octokit (4.8.0)
sawyer (~> 0.8.0, >= 0.5.3)
- ohai (14.0.28)
+ ohai (14.0.29)
chef-config (>= 12.8, < 15)
ffi (~> 1.9)
ffi-yajl (~> 2.2)
diff --git a/VERSION b/VERSION
index 86dc08b297..ba15e434ab 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.0.166 \ No newline at end of file
+14.0.167 \ 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 af2b000d99..fb860c59ff 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.0.166"
+ VERSION = "14.0.167"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 2ec814cc09..337d9abf10 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.0.166")
+ VERSION = Chef::VersionString.new("14.0.167")
end
#