summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <chef-ci@chef.io>2018-10-30 17:53:31 +0000
committerChef Expeditor <chef-ci@chef.io>2018-10-30 17:53:31 +0000
commitd894f9e5cfad979b8b8f65285beeffc51c5684b9 (patch)
treedbaf866cf4d5699ba89ea9977af6f7ea5ae53f01
parentceeb7c1bdede286bdb66d87247ce4fb73b419c74 (diff)
downloadchef-d894f9e5cfad979b8b8f65285beeffc51c5684b9.tar.gz
Bump version to 15.0.14 by Chef Expeditorv15.0.14
Obvious fix; these changes are the result of automation not creative thinking.
-rw-r--r--CHANGELOG.md7
-rw-r--r--Gemfile.lock14
-rw-r--r--VERSION2
-rw-r--r--chef-config/lib/chef-config/version.rb2
-rw-r--r--lib/chef/version.rb2
5 files changed, 14 insertions, 13 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3ae939cfae..d1d6d7176b 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.13 -->
-## [v15.0.13](https://github.com/chef/chef/tree/v15.0.13) (2018-10-29)
+<!-- latest_release 15.0.14 -->
+## [v15.0.14](https://github.com/chef/chef/tree/v15.0.14) (2018-10-30)
#### Merged Pull Requests
-- Refactor Cookbook loader logic now that we don&#39;t support merging [#7794](https://github.com/chef/chef/pull/7794) ([lamont-granquist](https://github.com/lamont-granquist))
+- Fix inspector to properly handle defaults that are symbols [#7813](https://github.com/chef/chef/pull/7813) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup -->
### Changes since latest stable release
#### Merged Pull Requests
+- Fix inspector to properly handle defaults that are symbols [#7813](https://github.com/chef/chef/pull/7813) ([tas50](https://github.com/tas50)) <!-- 15.0.14 -->
- Refactor Cookbook loader logic now that we don&#39;t support merging [#7794](https://github.com/chef/chef/pull/7794) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 15.0.13 -->
- Remove deprecated support for FreeBSD pkg provider [#7789](https://github.com/chef/chef/pull/7789) ([tas50](https://github.com/tas50)) <!-- 15.0.12 -->
- Multiple fixes to dmg_package [#7802](https://github.com/chef/chef/pull/7802) ([tas50](https://github.com/tas50)) <!-- 15.0.11 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 0e6d5f2222..d2254e43fe 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -8,10 +8,10 @@ GIT
GIT
remote: https://github.com/chef/ohai.git
- revision: 3759aeff5ff3c999fd99ffef44f6d00ad3fd0135
+ revision: 5236aff74b8f2a2e9244cff4d325ccb4f73b3d69
branch: master
specs:
- ohai (15.0.2)
+ ohai (15.0.4)
chef-config (>= 12.8, < 16)
ffi (~> 1.9)
ffi-yajl (~> 2.2)
@@ -27,10 +27,10 @@ GIT
PATH
remote: .
specs:
- chef (15.0.13)
+ chef (15.0.14)
addressable
bundler (>= 1.10)
- chef-config (= 15.0.13)
+ chef-config (= 15.0.14)
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.13-universal-mingw32)
+ chef (15.0.14-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 15.0.13)
+ chef-config (= 15.0.14)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -103,7 +103,7 @@ PATH
PATH
remote: chef-config
specs:
- chef-config (15.0.13)
+ chef-config (15.0.14)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 3.0)
diff --git a/VERSION b/VERSION
index 620a1642f3..f1d170d2b7 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.0.13 \ No newline at end of file
+15.0.14 \ 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 02f115eec6..e8b076df59 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.13".freeze
+ VERSION = "15.0.14".freeze
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 71ad6abc47..532860b90f 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.13")
+ VERSION = Chef::VersionString.new("15.0.14")
end
#