summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-04-19 09:43:02 +0000
committerChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-04-19 09:43:02 +0000
commit37160a7f12f30c09ddc58f8d22102dd45dda20aa (patch)
treeca1531ce88584ca5267d6fb0bf05ecb72d4471d9
parent3cfbcb02a78b6be9d2156e5f2b55bc558cdf70ea (diff)
downloadchef-37160a7f12f30c09ddc58f8d22102dd45dda20aa.tar.gz
Bump version to 14.0.204 by Expeditorv14.0.204
-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 2f3e200fd3..dd32f4569c 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.203 -->
-## [v14.0.203](https://github.com/chef/chef/tree/v14.0.203) (2018-04-17)
+<!-- latest_release 14.0.204 -->
+## [v14.0.204](https://github.com/chef/chef/tree/v14.0.204) (2018-04-19)
#### Merged Pull Requests
-- fix for Red Hat Satellite yum_package bug [#7147](https://github.com/chef/chef/pull/7147) ([lamont-granquist](https://github.com/lamont-granquist))
+- add name_property to resource inspector [#7164](https://github.com/chef/chef/pull/7164) ([thommay](https://github.com/thommay))
<!-- latest_release -->
<!-- release_rollup since=14.0.202 -->
### Changes since 14.0.202 release
#### Merged Pull Requests
+- add name_property to resource inspector [#7164](https://github.com/chef/chef/pull/7164) ([thommay](https://github.com/thommay)) <!-- 14.0.204 -->
- fix for Red Hat Satellite yum_package bug [#7147](https://github.com/chef/chef/pull/7147) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 14.0.203 -->
<!-- release_rollup -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 1b7385c5fb..95b7b85c5a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -15,10 +15,10 @@ GIT
PATH
remote: .
specs:
- chef (14.0.203)
+ chef (14.0.204)
addressable
bundler (>= 1.10)
- chef-config (= 14.0.203)
+ chef-config (= 14.0.204)
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.203-universal-mingw32)
+ chef (14.0.204-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 14.0.203)
+ chef-config (= 14.0.204)
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.203)
+ chef-config (14.0.204)
addressable
fuzzyurl
mixlib-config (~> 2.0)
diff --git a/VERSION b/VERSION
index aeeee614c7..0b8b2c6911 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.0.203 \ No newline at end of file
+14.0.204 \ 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 3ecd9aa38f..d4067206b2 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.203"
+ VERSION = "14.0.204"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 93ac0f321e..712d6ff20e 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.203")
+ VERSION = Chef::VersionString.new("14.0.204")
end
#