summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuke Kanies <luke@madstop.com>2008-10-03 16:12:49 -0500
committerJames Turnbull <james@lovedthanlost.net>2008-10-04 08:10:09 +1000
commitd2c89985bb356188ac52d00b0799cae655a9c75b (patch)
tree0c921036d756163a6499c5f088fbcebf5d0a57cc
parentd098a901745cf5c84731d8f46aabd225a6ffba2a (diff)
downloadpuppet-d2c89985bb356188ac52d00b0799cae655a9c75b.tar.gz
puppet-d2c89985bb356188ac52d00b0799cae655a9c75b.tar.xz
puppet-d2c89985bb356188ac52d00b0799cae655a9c75b.zip
Fixed #981 - Removed 'Adding aliases' info message
Signed-off-by: Luke Kanies <luke@madstop.com>
-rw-r--r--CHANGELOG2
-rw-r--r--lib/puppet/type.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 928ac8e83..ba05bb821 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,8 @@
0.24.x
Fixing #947 - pluginsync no longer fails poorly when no plugins exist
+ Fixed #981 - Removed 'Adding aliases' info message
+
Fixing #1614 - Environments no longer have to be listed out
Fixed #1628 - Changed node search to use certname rather than Facter hostname
diff --git a/lib/puppet/type.rb b/lib/puppet/type.rb
index e377a3547..7e8654921 100644
--- a/lib/puppet/type.rb
+++ b/lib/puppet/type.rb
@@ -1472,8 +1472,6 @@ class Type
raise(ArgumentError, "Cannot add aliases without a catalog") unless @resource.catalog
- @resource.info "Adding aliases %s" % aliases.collect { |a| a.inspect }.join(", ")
-
aliases.each do |other|
if obj = @resource.catalog.resource(@resource.class.name, other)
unless obj.object_id == @resource.object_id