summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-04-22 01:45:00 +0000
committerChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-04-22 01:45:00 +0000
commit49692feaaa5c4ae3cdef2d9afadd5d71b596697c (patch)
treebe544011dafb33b35abe29ded411d0d1c8ddc148
parentb27f87bcb6909c9694a5f584b02312ce9858cb87 (diff)
downloadchef-49692feaaa5c4ae3cdef2d9afadd5d71b596697c.tar.gz
Bump version to 14.0.207 by Expeditorv14.0.207
-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 dd7702adb5..cd6aa26b2f 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.206 -->
-## [v14.0.206](https://github.com/chef/chef/tree/v14.0.206) (2018-04-19)
+<!-- latest_release 14.0.207 -->
+## [v14.0.207](https://github.com/chef/chef/tree/v14.0.207) (2018-04-22)
#### Merged Pull Requests
-- Some options, i.e. metric, require specifying dev [#7162](https://github.com/chef/chef/pull/7162) ([tomdoherty](https://github.com/tomdoherty))
+- Avoid conflict with build_powershell_command from powershell_out mixin [#7173](https://github.com/chef/chef/pull/7173) ([stuartpreston](https://github.com/stuartpreston))
<!-- latest_release -->
<!-- release_rollup since=14.0.202 -->
### Changes since 14.0.202 release
#### Merged Pull Requests
+- Avoid conflict with build_powershell_command from powershell_out mixin [#7173](https://github.com/chef/chef/pull/7173) ([stuartpreston](https://github.com/stuartpreston)) <!-- 14.0.207 -->
- Some options, i.e. metric, require specifying dev [#7162](https://github.com/chef/chef/pull/7162) ([tomdoherty](https://github.com/tomdoherty)) <!-- 14.0.206 -->
- Windows MSI: files are now re-unzipped during repair mode [#7111](https://github.com/chef/chef/pull/7111) ([stuartpreston](https://github.com/stuartpreston)) <!-- 14.0.205 -->
- add name_property to resource inspector [#7164](https://github.com/chef/chef/pull/7164) ([thommay](https://github.com/thommay)) <!-- 14.0.204 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index afa127ba4e..f0275ad7ff 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -15,10 +15,10 @@ GIT
PATH
remote: .
specs:
- chef (14.0.206)
+ chef (14.0.207)
addressable
bundler (>= 1.10)
- chef-config (= 14.0.206)
+ chef-config (= 14.0.207)
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.206-universal-mingw32)
+ chef (14.0.207-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 14.0.206)
+ chef-config (= 14.0.207)
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.206)
+ chef-config (14.0.207)
addressable
fuzzyurl
mixlib-config (~> 2.0)
diff --git a/VERSION b/VERSION
index f0c5be30db..dcb0401c5f 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.0.206 \ No newline at end of file
+14.0.207 \ 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 06f64b6816..e482e030eb 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.206"
+ VERSION = "14.0.207"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 310636e71b..36866fd3c8 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.206")
+ VERSION = Chef::VersionString.new("14.0.207")
end
#