summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <chef-ci@chef.io>2018-11-07 18:46:29 +0000
committerChef Expeditor <chef-ci@chef.io>2018-11-07 18:46:29 +0000
commit2354497af306fa3473dcab81a90e200ecec122eb (patch)
tree91828cd82b88f3cb2138e94f4f625cf885112b1d
parent551ef15cbedd292c6d3265dc6e895a848e8e2dab (diff)
downloadchef-2354497af306fa3473dcab81a90e200ecec122eb.tar.gz
Bump version to 15.0.50 by Chef Expeditorv15.0.50
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 7acf7168fd..199866a1f4 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.49 -->
-## [v15.0.49](https://github.com/chef/chef/tree/v15.0.49) (2018-11-07)
+<!-- latest_release 15.0.50 -->
+## [v15.0.50](https://github.com/chef/chef/tree/v15.0.50) (2018-11-07)
#### Merged Pull Requests
-- Allow passing multiple ports in windows_firewall [#7879](https://github.com/chef/chef/pull/7879) ([tas50](https://github.com/tas50))
+- Update more descriptions and tweak default handling in chef-resource-inspector [#7884](https://github.com/chef/chef/pull/7884) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup -->
### Changes since latest stable release
#### Merged Pull Requests
+- Update more descriptions and tweak default handling in chef-resource-inspector [#7884](https://github.com/chef/chef/pull/7884) ([tas50](https://github.com/tas50)) <!-- 15.0.50 -->
- Allow passing multiple ports in windows_firewall [#7879](https://github.com/chef/chef/pull/7879) ([tas50](https://github.com/tas50)) <!-- 15.0.49 -->
- Add additional descriptions to resource and update others [#7881](https://github.com/chef/chef/pull/7881) ([tas50](https://github.com/tas50)) <!-- 15.0.48 -->
- resource inspector: don&#39;t convert nil to &quot;nil&quot; in default values [#7880](https://github.com/chef/chef/pull/7880) ([tas50](https://github.com/tas50)) <!-- 15.0.47 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index b1245ac05d..af7dfbd47f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -27,10 +27,10 @@ GIT
PATH
remote: .
specs:
- chef (15.0.49)
+ chef (15.0.50)
addressable
bundler (>= 1.10)
- chef-config (= 15.0.49)
+ chef-config (= 15.0.50)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -57,10 +57,10 @@ PATH
specinfra (~> 2.10)
syslog-logger (~> 1.6)
uuidtools (~> 2.1.5)
- chef (15.0.49-universal-mingw32)
+ chef (15.0.50-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 15.0.49)
+ chef-config (= 15.0.50)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -104,7 +104,7 @@ PATH
PATH
remote: chef-config
specs:
- chef-config (15.0.49)
+ chef-config (15.0.50)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 3.0)
diff --git a/VERSION b/VERSION
index eebdd26743..37e427196f 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.0.49 \ No newline at end of file
+15.0.50 \ 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 856456ffa0..08c703fa05 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.49".freeze
+ VERSION = "15.0.50".freeze
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index ae0744bfaf..1e7fb30d02 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.49")
+ VERSION = Chef::VersionString.new("15.0.50")
end
#