From 2c4059f3b4da4adceb0547bd2d7e2d69c20e1169 Mon Sep 17 00:00:00 2001
From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Sun, 29 Aug 2010 09:56:31 +0200
Subject: [PATCH] perl plugin: Remove the deprecated "plugin_flush_{all,one}"
 functions.

---
 bindings/perl/lib/Collectd.pm | 29 -----------------------------
 src/collectd-perl.pod         | 17 -----------------
 2 files changed, 46 deletions(-)

diff --git a/bindings/perl/lib/Collectd.pm b/bindings/perl/lib/Collectd.pm
index f1b5d859..ca3b5d23 100644
--- a/bindings/perl/lib/Collectd.pm
+++ b/bindings/perl/lib/Collectd.pm
@@ -465,35 +465,6 @@ sub plugin_flush {
 	}
 }
 
-sub plugin_flush_one {
-	my $timeout = shift;
-	my $name    = shift;
-
-	WARNING ("Collectd::plugin_flush_one is deprecated - "
-		. "use Collectd::plugin_flush instead.");
-
-	if (! (defined ($timeout) && defined ($name))) {
-		ERROR ("Usage: Collectd::plugin_flush_one(timeout, name)");
-		return;
-	}
-
-	plugin_flush (plugins => $name, timeout => $timeout);
-}
-
-sub plugin_flush_all {
-	my $timeout = shift;
-
-	WARNING ("Collectd::plugin_flush_all is deprecated - "
-		. "use Collectd::plugin_flush instead.");
-
-	if (! defined ($timeout)) {
-		ERROR ("Usage: Collectd::plugin_flush_all(timeout)");
-		return;
-	}
-
-	plugin_flush (timeout => $timeout);
-}
-
 sub fc_call {
 	my $type    = shift;
 	my $name    = shift;
diff --git a/src/collectd-perl.pod b/src/collectd-perl.pod
index bacf8850..6b44722c 100644
--- a/src/collectd-perl.pod
+++ b/src/collectd-perl.pod
@@ -400,23 +400,6 @@ argument has been specified, only named plugins will be flushed. The value of
 the B<plugins> and B<identifiers> arguments may either be a string or a
 reference to an array of strings.
 
-=item B<plugin_flush_one> (I<timeout>, I<plugin>)
-
-This is identical to using "plugin_flush (timeout =E<gt> I<timeout>, plugins
-=E<gt> I<plugin>".
-
-B<Note>: Starting with version 4.5 of collectd, B<plugin_flush_one> has been
-deprecated and will be removed in some future version of collectd. Use
-B<plugin_flush> instead.
-
-=item B<plugin_flush_all> (I<timeout>)
-
-This is identical to using "plugin_flush (timeout =E<gt> I<timeout>)".
-
-B<Note>: Starting with version 4.5 of collectd, B<plugin_flush_all> has been
-deprecated and will be removed in some future version of collectd. Use
-B<plugin_flush> instead.
-
 =item B<plugin_dispatch_notification> (I<notification>)
 
 Submits a I<notification> to the daemon which will then pass it to all
-- 
2.11.0