From: trenkel <github@semidefinite.de>
Date: Fri, 5 Aug 2016 16:45:52 +0000 (+0200)
Subject: Merge pull request #1850 from rubenk/python-return-error-when-config-callback-fails
X-Git-Tag: collectd-5.6.0~105
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=9540b75f95d984fd90fca34545674ba3e8f34e8d;hp=5b4053d27b6a24e2f18e678f0d8c3343b7dfad7c;p=collectd.git

Merge pull request #1850 from rubenk/python-return-error-when-config-callback-fails

python plugin: return error on config failure
---

diff --git a/configure.ac b/configure.ac
index 5171dec8..2ac9c729 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,5 @@
 dnl Process this file with autoconf to produce a configure script.
+AC_PREREQ([2.60])
 AC_INIT([collectd],[m4_esyscmd(./version-gen.sh)])
 AC_CONFIG_SRCDIR(src/target_set.c)
 AC_CONFIG_HEADERS(src/config.h)
diff --git a/src/collectd-python.pod b/src/collectd-python.pod
index 0202b774..4647a114 100644
--- a/src/collectd-python.pod
+++ b/src/collectd-python.pod
@@ -679,22 +679,6 @@ To register those functions with collectd:
 See the section L<"CLASSES"> above for a complete documentation of the data
 types used by the read, write and match functions.
 
-=head1 NOTES
-
-=over 4
-
-=item *
-
-Please feel free to send in new plugins to collectd's mailing list at
-E<lt>collectdE<nbsp>atE<nbsp>collectd.orgE<gt> for review and, possibly,
-inclusion in the main distribution. In the latter case, we will take care of
-keeping the plugin up to date and adapting it to new versions of collectd.
-
-Before submitting your plugin, please take a look at
-L<http://collectd.org/dev-info.shtml>.
-
-=back
-
 =head1 CAVEATS
 
 =over 4