summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-02-09 12:53:32 +0000
committerChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-02-09 12:53:32 +0000
commita7d56100275045ad44e57386aad86e463788ee85 (patch)
tree6a1ac959851872c282d5947ff751eb33723d1757
parentcfaca04b6a5483806590c7c2ff56f57a1fb79e85 (diff)
downloadchef-a7d56100275045ad44e57386aad86e463788ee85.tar.gz
Bump version to 14.0.50 by Expeditorv14.0.50
-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 13a4c42e92..074b4fdaff 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.49 -->
-## [v14.0.49](https://github.com/chef/chef/tree/v14.0.49) (2018-02-09)
+<!-- latest_release 14.0.50 -->
+## [v14.0.50](https://github.com/chef/chef/tree/v14.0.50) (2018-02-09)
#### Merged Pull Requests
-- Simplify powershell_out calls in powershell_package [#6837](https://github.com/chef/chef/pull/6837) ([Happycoil](https://github.com/Happycoil))
+- Use the license_scout that comes with Omnibus gem [#6839](https://github.com/chef/chef/pull/6839) ([tduffield](https://github.com/tduffield))
<!-- latest_release -->
<!-- release_rollup since=13.7.16 -->
### Changes since 13.7.16 release
#### Merged Pull Requests
+- Use the license_scout that comes with Omnibus gem [#6839](https://github.com/chef/chef/pull/6839) ([tduffield](https://github.com/tduffield)) <!-- 14.0.50 -->
- Simplify powershell_out calls in powershell_package [#6837](https://github.com/chef/chef/pull/6837) ([Happycoil](https://github.com/Happycoil)) <!-- 14.0.49 -->
- Don&#39;t rely on the Passwd Ohai plugin in resources [#6833](https://github.com/chef/chef/pull/6833) ([thommay](https://github.com/thommay)) <!-- 14.0.48 -->
- Link to the knife docs when the knife config file is missing [#6364](https://github.com/chef/chef/pull/6364) ([tas50](https://github.com/tas50)) <!-- 14.0.47 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 263650b154..1486a29e7a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -35,10 +35,10 @@ GIT
PATH
remote: .
specs:
- chef (14.0.49)
+ chef (14.0.50)
addressable
bundler (>= 1.10)
- chef-config (= 14.0.49)
+ chef-config (= 14.0.50)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -65,10 +65,10 @@ PATH
specinfra (~> 2.10)
syslog-logger (~> 1.6)
uuidtools (~> 2.1.5)
- chef (14.0.49-universal-mingw32)
+ chef (14.0.50-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 14.0.49)
+ chef-config (= 14.0.50)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -110,7 +110,7 @@ PATH
PATH
remote: chef-config
specs:
- chef-config (14.0.49)
+ chef-config (14.0.50)
addressable
fuzzyurl
mixlib-config (~> 2.0)
diff --git a/VERSION b/VERSION
index ca4c1d90d5..42db1d0a59 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.0.49 \ No newline at end of file
+14.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 a193ea2d6d..f5c4062739 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.49"
+ VERSION = "14.0.50"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index ca2ddf3d68..6af0290cbc 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.49")
+ VERSION = Chef::VersionString.new("14.0.50")
end
#