summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <chef-ci@chef.io>2019-04-04 16:09:06 +0000
committerChef Expeditor <chef-ci@chef.io>2019-04-04 16:09:06 +0000
commit3c264946e8dd051e56418751f093eb3afa3c1387 (patch)
tree803499537f71a5b3be9d87b96674ff49c87a5df9
parent8f0d49b7f2a30ee012ab75f3a9436e474a702168 (diff)
downloadchef-3c264946e8dd051e56418751f093eb3afa3c1387.tar.gz
Bump version to 15.0.204 by Chef Expeditorv15.0.204
Obvious fix; these changes are the result of automation not creative thinking.
-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 2f3979f916..4559e21ae0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 15.0.203 -->
-## [v15.0.203](https://github.com/chef/chef/tree/v15.0.203) (2019-04-03)
+<!-- latest_release 15.0.204 -->
+## [v15.0.204](https://github.com/chef/chef/tree/v15.0.204) (2019-04-04)
#### Merged Pull Requests
-- Remove windows-api pin and update Gemfile.lock [#8328](https://github.com/chef/chef/pull/8328) ([jaymalasinha](https://github.com/jaymalasinha))
+- Update nokogiri to 1.10.2 [#8338](https://github.com/chef/chef/pull/8338) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup -->
### Changes since latest stable release
#### Merged Pull Requests
+- Update nokogiri to 1.10.2 [#8338](https://github.com/chef/chef/pull/8338) ([tas50](https://github.com/tas50)) <!-- 15.0.204 -->
- Remove windows-api pin and update Gemfile.lock [#8328](https://github.com/chef/chef/pull/8328) ([jaymalasinha](https://github.com/jaymalasinha)) <!-- 15.0.203 -->
- fix data collector non-utf8 file output [#8337](https://github.com/chef/chef/pull/8337) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 15.0.202 -->
- Update inspec to 3.9.0 [#8336](https://github.com/chef/chef/pull/8336) ([tas50](https://github.com/tas50)) <!-- 15.0.201 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 50ac5e6ea0..cbe8aabfaf 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -27,10 +27,10 @@ GIT
PATH
remote: .
specs:
- chef (15.0.203)
+ chef (15.0.204)
addressable
bundler (>= 1.10)
- chef-config (= 15.0.203)
+ chef-config (= 15.0.204)
chef-zero (>= 14.0.11)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -51,10 +51,10 @@ PATH
proxifier (~> 1.0)
syslog-logger (~> 1.6)
uuidtools (~> 2.1.5)
- chef (15.0.203-universal-mingw32)
+ chef (15.0.204-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 15.0.203)
+ chef-config (= 15.0.204)
chef-zero (>= 14.0.11)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -91,7 +91,7 @@ PATH
PATH
remote: chef-config
specs:
- chef-config (15.0.203)
+ chef-config (15.0.204)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 4.0)
diff --git a/VERSION b/VERSION
index 305d35e5e6..bb60c98733 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.0.203 \ No newline at end of file
+15.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 27e4708962..314a090d02 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 = "15.0.203".freeze
+ VERSION = "15.0.204".freeze
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 693ba3d014..06d70c1939 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("15.0.203")
+ VERSION = Chef::VersionString.new("15.0.204")
end
#