Merge branch 'feature-log-logstash' of github.com:pyr/collectd into feature-log-logstash

Conflicts:
	configure.ac

diff --cc configure.ac
index f1c7b8aba1169f3a01f7bdf7993c52d192d4871f,f710317dd46779851c735e80bc9f96b7582c58df..397fdf7098b9ec9b912af7c68547b93ce1ad5bd7
--- 1/configure.ac
--- 2/configure.in
+++ b/configure.ac
@@@ -981,7 -980,7 +981,7 @@@ if test "x$fp_layout_type" = "xunknown"
        uint8_t c[8];
        double d;
  
--      d = 8.642135e130; 
++      d = 8.642135e130;
        memcpy ((void *) &i0, (void *) &d, 8);
  
        i1 = i0;
@@@ -1036,7 -1035,7 +1036,7 @@@ if test "x$fp_layout_type" = "xunknown"
        uint8_t c[8];
        double d;
  
--      d = 8.642135e130; 
++      d = 8.642135e130;
        memcpy ((void *) &i0, (void *) &d, 8);
  
        i1 = endianflip (i0);
@@@ -1085,7 -1084,7 +1085,7 @@@ if test "x$fp_layout_type" = "xunknown"
        uint8_t c[8];
        double d;
  
--      d = 8.642135e130; 
++      d = 8.642135e130;
        memcpy ((void *) &i0, (void *) &d, 8);
  
        i1 = intswap (i0);
@@@ -1237,7 -1225,7 +1237,7 @@@ AC_MSG_CHECKING([if have htonll defined
        have_htonll="yes"
        AC_DEFINE(HAVE_HTONLL, 1, [Define if the function htonll exists.])
      ])
-- 
++
  AC_MSG_RESULT([$have_htonll])
  
  # Check for structures
@@@ -1380,7 -1368,7 +1380,7 @@@ collectd additional packages:]
  
  AM_CONDITIONAL([BUILD_FREEBSD],[test "x$x$ac_system" = "xFreeBSD"])
  
--AM_CONDITIONAL([BUILD_AIX],[test "x$x$ac_system" = "xAIX"]) 
++AM_CONDITIONAL([BUILD_AIX],[test "x$x$ac_system" = "xAIX"])
  
  if test "x$ac_system" = "xAIX"
  then
@@@ -2794,7 -2786,7 +2794,7 @@@ the
        else
                SAVE_CPPFLAGS="$CPPFLAGS"
                CPPFLAGS="$CPPFLAGS $with_snmp_cflags"
--              
++
                AC_CHECK_HEADERS(net-snmp/net-snmp-config.h, [], [with_libnetsnmp="no (net-snmp/net-snmp-config.h not found)"])
  
                CPPFLAGS="$SAVE_CPPFLAGS"
@@@ -3021,7 -3013,7 +3021,7 @@@ if test "x$with_libowcapi" = "xyes
  then
        SAVE_CPPFLAGS="$CPPFLAGS"
        CPPFLAGS="$with_libowcapi_cppflags"
--      
++
        AC_CHECK_HEADERS(owcapi.h, [with_libowcapi="yes"], [with_libowcapi="no (owcapi.h not found)"])
  
        CPPFLAGS="$SAVE_CPPFLAGS"
@@@ -3032,7 -3024,7 +3032,7 @@@ the
        SAVE_CPPFLAGS="$CPPFLAGS"
        LDFLAGS="$with_libowcapi_libs"
        CPPFLAGS="$with_libowcapi_cppflags"
--      
++
        AC_CHECK_LIB(owcapi, OW_get, [with_libowcapi="yes"], [with_libowcapi="no (libowcapi not found)"])
  
        LDFLAGS="$SAVE_LDFLAGS"
@@@ -4039,7 -3944,7 +4039,7 @@@ CPPFLAGS="$SAVE_CPPFLAGS
  LDFLAGS="$SAVE_LDFLAGS"
  
  if test "x$with_libtokyotyrant" = "xyes"
--then 
++then
    BUILD_WITH_LIBTOKYOTYRANT_CPPFLAGS="$with_libtokyotyrant_cppflags"
    BUILD_WITH_LIBTOKYOTYRANT_LDFLAGS="$with_libtokyotyrant_ldflags"
    BUILD_WITH_LIBTOKYOTYRANT_LIBS="$with_libtokyotyrant_libs"
@@@ -5491,7 -5397,8 +5498,8 @@@ Configuration
      libvirt . . . . . . . $enable_libvirt
      load  . . . . . . . . $enable_load
      logfile . . . . . . . $enable_logfile
 -    lpar... . . . . . . . $enable_lpar
 +    lpar  . . . . . . . . $enable_lpar
+     log_logstash ........ $enable_log_logstash
      lvm . . . . . . . . . $enable_lvm
      madwifi . . . . . . . $enable_madwifi
      match_empty_counter . $enable_match_empty_counter

diff --cc src/Makefile.am
Simple merge

diff --cc src/collectd.conf.in
Simple merge