summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <chef-ci@chef.io>2018-10-31 19:21:53 +0000
committerChef Expeditor <chef-ci@chef.io>2018-10-31 19:21:53 +0000
commit13c549c5bc3b9dedd15854bd49df8e69860e015d (patch)
tree65b43aa3540a294143d06cbedfdb9aef74ee354c
parent0a96dd503e839d58abb60febc9edd6965114a762 (diff)
downloadchef-14.6.48.tar.gz
Bump version to 14.6.48 by Chef Expeditorv14.6.48
Obvious fix; these changes are the result of automation not creative thinking.
-rw-r--r--CHANGELOG.md12
-rw-r--r--Gemfile.lock12
-rw-r--r--VERSION2
-rw-r--r--chef-config/lib/chef-config/version.rb2
-rw-r--r--lib/chef/version.rb2
5 files changed, 19 insertions, 11 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9d1aa1ea22..a38c061a14 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release -->
+<!-- latest_release 14.6.48 -->
+## [v14.6.48](https://github.com/chef/chef/tree/v14.6.48) (2018-10-31)
+
+#### Merged Pull Requests
+- Allow passing array to supports in mount resource again [#7809](https://github.com/chef/chef/pull/7809) ([tas50](https://github.com/tas50))
<!-- latest_release -->
-<!-- release_rollup -->
+<!-- release_rollup since=14.6.47 -->
+### Changes since 14.6.47 release
+
+#### Merged Pull Requests
+- Allow passing array to supports in mount resource again [#7809](https://github.com/chef/chef/pull/7809) ([tas50](https://github.com/tas50)) <!-- 14.6.48 -->
<!-- release_rollup -->
<!-- latest_stable_release -->
diff --git a/Gemfile.lock b/Gemfile.lock
index acc32e0fe9..35d81a01a0 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -9,10 +9,10 @@ GIT
PATH
remote: .
specs:
- chef (14.6.47)
+ chef (14.6.48)
addressable
bundler (>= 1.10)
- chef-config (= 14.6.47)
+ chef-config (= 14.6.48)
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 (14.6.47-universal-mingw32)
+ chef (14.6.48-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 14.6.47)
+ chef-config (= 14.6.48)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -85,7 +85,7 @@ PATH
PATH
remote: chef-config
specs:
- chef-config (14.6.47)
+ chef-config (14.6.48)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 3.0)
@@ -379,4 +379,4 @@ DEPENDENCIES
yard
BUNDLED WITH
- 1.16.6
+ 1.17.1
diff --git a/VERSION b/VERSION
index 0cec8c78dd..d4ed638e99 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.6.47 \ No newline at end of file
+14.6.48 \ 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 2da9c1a5f7..1033660b35 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.6.47".freeze
+ VERSION = "14.6.48".freeze
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 0e8cf397eb..530b001568 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.6.47")
+ VERSION = Chef::VersionString.new("14.6.48")
end
#