summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <chef-ci@chef.io>2018-10-29 19:10:04 +0000
committerChef Expeditor <chef-ci@chef.io>2018-10-29 19:10:04 +0000
commit848c85802809372ed3f62abb68c53bf42281ce24 (patch)
tree8ffa402ba68a2bcb21b3b7e7340b14084bdae2b2
parent61436a15e0272f387ac2db7fcfa3687aaae6a6ea (diff)
downloadchef-848c85802809372ed3f62abb68c53bf42281ce24.tar.gz
Bump version to 15.0.13 by Chef Expeditorv15.0.13
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 fa63cd4a74..3ae939cfae 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.12 -->
-## [v15.0.12](https://github.com/chef/chef/tree/v15.0.12) (2018-10-29)
+<!-- latest_release 15.0.13 -->
+## [v15.0.13](https://github.com/chef/chef/tree/v15.0.13) (2018-10-29)
#### Merged Pull Requests
-- Remove deprecated support for FreeBSD pkg provider [#7789](https://github.com/chef/chef/pull/7789) ([tas50](https://github.com/tas50))
+- 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))
<!-- latest_release -->
<!-- release_rollup -->
### Changes since latest stable release
#### 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)) <!-- 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 -->
- Allow passing array to supports in mount again [#7803](https://github.com/chef/chef/pull/7803) ([tas50](https://github.com/tas50)) <!-- 15.0.10 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 89c1a96d05..0e6d5f2222 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -27,10 +27,10 @@ GIT
PATH
remote: .
specs:
- chef (15.0.12)
+ chef (15.0.13)
addressable
bundler (>= 1.10)
- chef-config (= 15.0.12)
+ chef-config (= 15.0.13)
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.12-universal-mingw32)
+ chef (15.0.13-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 15.0.12)
+ chef-config (= 15.0.13)
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.12)
+ chef-config (15.0.13)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 3.0)
diff --git a/VERSION b/VERSION
index 55b22c6b41..620a1642f3 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.0.12 \ No newline at end of file
+15.0.13 \ 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 1afb67b1c1..02f115eec6 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.12".freeze
+ VERSION = "15.0.13".freeze
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 8207f18039..71ad6abc47 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.12")
+ VERSION = Chef::VersionString.new("15.0.13")
end
#