summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-03-24 08:38:41 +0000
committerChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-03-24 08:38:41 +0000
commitce0a8e7e0aa7e418e231762ed5ab4e47a4181e21 (patch)
tree630ea668cd6f37764381659381fcf0466cd2ad60
parent33ae3100f35b9fdd820deac123904766b154c387 (diff)
downloadchef-ce0a8e7e0aa7e418e231762ed5ab4e47a4181e21.tar.gz
Bump version to 13.8.12 by Expeditorv13.8.12
-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 375b287b57..d2edd5aaac 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 13.8.11 -->
-## [v13.8.11](https://github.com/chef/chef/tree/v13.8.11) (2018-03-23)
+<!-- latest_release 13.8.12 -->
+## [v13.8.12](https://github.com/chef/chef/tree/v13.8.12) (2018-03-24)
#### Merged Pull Requests
-- Empty commit to trigger a release build [#7040](https://github.com/chef/chef/pull/7040) ([btm](https://github.com/btm))
+- partially revert 61e3d4bb: do not use properties for mount [#7031](https://github.com/chef/chef/pull/7031) ([thommay](https://github.com/thommay))
<!-- latest_release -->
<!-- release_rollup since=13.8.5 -->
### Changes since 13.8.5 release
#### Merged Pull Requests
+- partially revert 61e3d4bb: do not use properties for mount [#7031](https://github.com/chef/chef/pull/7031) ([thommay](https://github.com/thommay)) <!-- 13.8.12 -->
- Empty commit to trigger a release build [#7040](https://github.com/chef/chef/pull/7040) ([btm](https://github.com/btm)) <!-- 13.8.11 -->
- [chef-13] support nils because of course [#7017](https://github.com/chef/chef/pull/7017) ([thommay](https://github.com/thommay)) <!-- 13.8.10 -->
- Backport mount provider fixes to 13 [#7007](https://github.com/chef/chef/pull/7007) ([thommay](https://github.com/thommay)) <!-- 13.8.9 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 8569ba01ca..098e3e84e6 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -9,10 +9,10 @@ GIT
PATH
remote: .
specs:
- chef (13.8.11)
+ chef (13.8.12)
addressable
bundler (>= 1.10)
- chef-config (= 13.8.11)
+ chef-config (= 13.8.12)
chef-zero (~> 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -39,10 +39,10 @@ PATH
specinfra (~> 2.10)
syslog-logger (~> 1.6)
uuidtools (~> 2.1.5)
- chef (13.8.11-universal-mingw32)
+ chef (13.8.12-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 13.8.11)
+ chef-config (= 13.8.12)
chef-zero (~> 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -84,7 +84,7 @@ PATH
PATH
remote: chef-config
specs:
- chef-config (13.8.11)
+ chef-config (13.8.12)
addressable
fuzzyurl
mixlib-config (~> 2.0)
diff --git a/VERSION b/VERSION
index af8226eb01..e1ad17662e 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-13.8.11 \ No newline at end of file
+13.8.12 \ 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 e903c59b5d..86a835fdca 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 = "13.8.11"
+ VERSION = "13.8.12"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 3ca4a10e41..8161b048e6 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("13.8.11")
+ VERSION = Chef::VersionString.new("13.8.12")
end
#