summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2020-10-19 10:59:12 -0700
committerGitHub <noreply@github.com>2020-10-19 10:59:12 -0700
commit23267386524996cb91b2ac28ccaca213967540cd (patch)
tree38cc3ccc0b6d5059978125ddebf13de3fa829008
parentf4259c184a3fde7c656335c8b1e5401356acae18 (diff)
parent9f5895984c26fa79432c9932d44c11e479f3cbf9 (diff)
downloadchef-23267386524996cb91b2ac28ccaca213967540cd.tar.gz
Merge pull request #10520 from chef/lwrp_cleanup
Move the alias for attribute to property right into the property mixin
-rw-r--r--lib/chef/mixin/properties.rb2
-rw-r--r--lib/chef/resource/lwrp_base.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/chef/mixin/properties.rb b/lib/chef/mixin/properties.rb
index eca0787dc4..c42e3889b0 100644
--- a/lib/chef/mixin/properties.rb
+++ b/lib/chef/mixin/properties.rb
@@ -135,6 +135,8 @@ class Chef
property.emit_dsl
end
+ alias :attribute :property
+
#
# Create a reusable property type that can be used in multiple properties
# in different resources.
diff --git a/lib/chef/resource/lwrp_base.rb b/lib/chef/resource/lwrp_base.rb
index 85d0b1df35..cf883d1ee5 100644
--- a/lib/chef/resource/lwrp_base.rb
+++ b/lib/chef/resource/lwrp_base.rb
@@ -72,8 +72,6 @@ class Chef
resource_class
end
- alias :attribute :property
-
# Adds +action_names+ to the list of valid actions for this resource.
# Does not include superclass's action list when appending.
def actions(*action_names)