summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorLamont Granquist <lamont@scriptkiddie.org>2018-10-29 10:08:32 -0700
committerGitHub <noreply@github.com>2018-10-29 10:08:32 -0700
commit1ccd6faebf852dc77ecf72560c1a24b287018742 (patch)
tree8409b9a0f328c28aee523f36c93c98dacf11622e /lib
parentc7d9809deee1f5ebc5c7ba8ec5343f026d60698c (diff)
parentb439716c06ffb69c810813d8d17d47efad09ac4a (diff)
downloadchef-1ccd6faebf852dc77ecf72560c1a24b287018742.tar.gz
Merge pull request #7803 from chef/mount_array
Allow passing array to supports in mount again
Diffstat (limited to 'lib')
-rw-r--r--lib/chef/resource/mount.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/chef/resource/mount.rb b/lib/chef/resource/mount.rb
index f3a8af7932..71e23c8cdb 100644
--- a/lib/chef/resource/mount.rb
+++ b/lib/chef/resource/mount.rb
@@ -1,7 +1,7 @@
#
# Author:: Joshua Timberman (<joshua@chef.io>)
# Author:: Tyler Cloke (<tyler@chef.io>)
-# Copyright:: Copyright 2009-2017, Chef Software Inc.
+# Copyright:: Copyright 2009-2018, Chef Software Inc.
# License:: Apache License, Version 2.0
#
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -28,7 +28,7 @@ class Chef
allowed_actions :mount, :umount, :unmount, :remount, :enable, :disable
# this is a poor API please do not re-use this pattern
- property :supports, Hash,
+ property :supports, [Array, Hash],
description: "Specify a Hash of supported mount features.",
default: lazy { { remount: false } },
coerce: proc { |x| x.is_a?(Array) ? x.each_with_object({}) { |i, m| m[i] = true } : x }