diff options
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | lib/chef/property.rb | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index ed7fffc22b..1ec77b2630 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,7 +25,7 @@ before_script: branches: only: - master - - 11-stable + - chef-12 env: global: diff --git a/lib/chef/property.rb b/lib/chef/property.rb index 8fa290251a..d1be172ac2 100644 --- a/lib/chef/property.rb +++ b/lib/chef/property.rb @@ -657,6 +657,10 @@ class Chef # as needed. return if Chef::Resource.properties.keys.include?(name) + # Special case for `supports` as it was moved in Chef 13 and this is causing + # some user confusion in cookbooks that need to support both 12 and 13. + return if name.to_s == 'supports' + # Emit the deprecation. resource_name = declared_in.respond_to?(:resource_name) ? declared_in.resource_name : declared_in Chef.deprecated(:property_name_collision, "Property `#{name}` of resource `#{resource_name}` overwrites an existing method. " \ |