diff options
| author | Jesse Wolfe <jes5199@gmail.com> | 2011-03-15 17:49:31 -0700 |
|---|---|---|
| committer | Jesse Wolfe <jes5199@gmail.com> | 2011-03-15 17:49:31 -0700 |
| commit | 4cb2f01884e04a8e08fb4eee18232412d4194b6c (patch) | |
| tree | 6788c517b32c36f1c5e58d239143bca39f0775cb /lib | |
| parent | 9781032736a34f577241828bcf812a648b4f42e9 (diff) | |
| parent | 4f34dbf206e591614c2fc06ce9bed1628ee85715 (diff) | |
| download | puppet-4cb2f01884e04a8e08fb4eee18232412d4194b6c.tar.gz puppet-4cb2f01884e04a8e08fb4eee18232412d4194b6c.tar.xz puppet-4cb2f01884e04a8e08fb4eee18232412d4194b6c.zip | |
Merge branch 'ticket/2.6.next/5610' into 2.6.next
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/puppet/type.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/puppet/type.rb b/lib/puppet/type.rb index 205d809c1..d24cc8554 100644 --- a/lib/puppet/type.rb +++ b/lib/puppet/type.rb @@ -200,7 +200,7 @@ class Type end def uniqueness_key - to_resource.uniqueness_key + self.class.key_attributes.sort_by { |attribute_name| attribute_name.to_s }.map{ |attribute_name| self[attribute_name] } end # Create a new parameter. Requires a block and a name, stores it in the |