This feature has been broken since who knows when, yet no one's noticed. Thus, it's a good candidate for removal.
Signed-off-by: Luke Kanies <[email protected]> --- lib/puppet/defaults.rb | 1 - lib/puppet/transaction.rb | 4 ---- test/puppet/defaults.rb | 2 +- test/util/metrics.rb | 5 ----- 4 files changed, 1 insertions(+), 11 deletions(-) diff --git a/lib/puppet/defaults.rb b/lib/puppet/defaults.rb index 4fb8bfe..877e2b2 100644 --- a/lib/puppet/defaults.rb +++ b/lib/puppet/defaults.rb @@ -445,7 +445,6 @@ module Puppet Directories for each reporting host will be created under this directory." }, - :rrdgraph => [false, "Whether RRD information should be graphed."], :rrdinterval => ["$runinterval", "How often RRD should expect data. This should match how often the hosts report back to the server."], :strict_hostname_checking => [false, "Whether to only search for the complete diff --git a/lib/puppet/transaction.rb b/lib/puppet/transaction.rb index ea283d8..c0b4c0e 100644 --- a/lib/puppet/transaction.rb +++ b/lib/puppet/transaction.rb @@ -508,10 +508,6 @@ class Transaction return end - if Puppet[:rrdgraph] == true - report.graph() - end - if Puppet[:summarize] puts report.summary end diff --git a/test/puppet/defaults.rb b/test/puppet/defaults.rb index 7befb9f..d53c232 100755 --- a/test/puppet/defaults.rb +++ b/test/puppet/defaults.rb @@ -11,7 +11,7 @@ class TestPuppetDefaults < Test::Unit::TestCase @@dirs = %w{rrddir confdir vardir logdir statedir} @@files = %w{statefile manifest masterlog} @@normals = %w{puppetport masterport server} - @@booleans = %w{rrdgraph noop} + @@booleans = %w{noop} def testVersion assert( Puppet.version =~ /^[0-9]+(\.[0-9]+)*/, "got invalid version number %s" % Puppet.version ) diff --git a/test/util/metrics.rb b/test/util/metrics.rb index b3219fc..6dcb841 100755 --- a/test/util/metrics.rb +++ b/test/util/metrics.rb @@ -49,11 +49,6 @@ class TestMetric < PuppetTest::TestCase } end - def setup - super - Puppet[:rrdgraph] = true - end - def test_fakedata report = Puppet::Transaction::Report.new time = Time.now.to_i -- 1.6.1 --~--~---------~--~----~------------~-------~--~----~ You received this message because you are subscribed to the Google Groups "Puppet Developers" group. To post to this group, send email to [email protected] To unsubscribe from this group, send email to [email protected] For more options, visit this group at http://groups.google.com/group/puppet-dev?hl=en -~----------~----~----~----~------~----~------~--~---
