Merge branch 'hugepages'

diff --cc README
Simple merge

diff --cc configure.ac
index 9a6da11dc7ce9c6c8772dfceb4f7c360c889c079,c52950bf1fd7ab13e99dedc1ab92d734691d8e68..929205bc672f7550cf610960668440326afd1371
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -5707,8 -5546,7 +5707,9 @@@ plugin_entropy="no
  plugin_ethstat="no"
  plugin_fhcount="no"
  plugin_fscache="no"
 +plugin_gps="no"
 +plugin_grpc="no"
+ plugin_hugepages="no"
  plugin_interface="no"
  plugin_ipmi="no"
  plugin_ipvs="no"
@@@ -6160,9 -5971,9 +6162,10 @@@ AC_PLUGIN([fhcount],             [$plug
  AC_PLUGIN([filecount],           [yes],                     [Count files in directories])
  AC_PLUGIN([fscache],             [$plugin_fscache],         [fscache statistics])
  AC_PLUGIN([gmond],               [$with_libganglia],        [Ganglia plugin])
 -AC_PLUGIN([grpc],                [$with_grpc],              [gRPC plugin])
 +AC_PLUGIN([gps],                 [$plugin_gps],             [GPS plugin])
 +AC_PLUGIN([grpc],                [$plugin_grpc],            [gRPC plugin])
  AC_PLUGIN([hddtemp],             [yes],                     [Query hddtempd])
+ AC_PLUGIN([hugepages],           [$plugin_hugepages],       [Hugepages statistics])
  AC_PLUGIN([interface],           [$plugin_interface],       [Interface traffic statistics])
  AC_PLUGIN([ipc],                 [$plugin_ipc],             [IPC statistics])
  AC_PLUGIN([ipmi],                [$plugin_ipmi],            [IPMI sensor statistics])
@@@ -6590,9 -6383,9 +6593,10 @@@ AC_MSG_RESULT([    fhcount . . . . . . 
  AC_MSG_RESULT([    filecount . . . . . . $enable_filecount])
  AC_MSG_RESULT([    fscache . . . . . . . $enable_fscache])
  AC_MSG_RESULT([    gmond . . . . . . . . $enable_gmond])
 +AC_MSG_RESULT([    gps . . . . . . . . . $enable_gps])
  AC_MSG_RESULT([    grpc  . . . . . . . . $enable_grpc])
  AC_MSG_RESULT([    hddtemp . . . . . . . $enable_hddtemp])
+ AC_MSG_RESULT([    hugepages . . . . . . $enable_hugepages])
  AC_MSG_RESULT([    interface . . . . . . $enable_interface])
  AC_MSG_RESULT([    ipc . . . . . . . . . $enable_ipc])
  AC_MSG_RESULT([    ipmi  . . . . . . . . $enable_ipmi])

diff --cc src/Makefile.am
Simple merge

diff --cc src/collectd.conf.in
index f68981169f5390bb4808c96a8dcad60bfc7af55a,998e2117a7a479062ab60fe11e4244e2648f0913..16b66482973c5fe4ff8ebedbe0a1939397e2385d
--- 1/src/collectd.conf.in
--- 2/src/collectd.conf.in
+++ b/src/collectd.conf.in
@@@ -123,9 -122,9 +123,10 @@@
  #@BUILD_PLUGIN_FILECOUNT_TRUE@LoadPlugin filecount
  #@BUILD_PLUGIN_FSCACHE_TRUE@LoadPlugin fscache
  #@BUILD_PLUGIN_GMOND_TRUE@LoadPlugin gmond
 +#@BUILD_PLUGIN_GPS_TRUE@LoadPlugin gps
  #@BUILD_PLUGIN_GRPC_TRUE@LoadPlugin grpc
  #@BUILD_PLUGIN_HDDTEMP_TRUE@LoadPlugin hddtemp
+ #@BUILD_PLUGIN_HUGEPAGES_TRUE@LoadPlugin hugepages
  @BUILD_PLUGIN_INTERFACE_TRUE@@BUILD_PLUGIN_INTERFACE_TRUE@LoadPlugin interface
  #@BUILD_PLUGIN_IPC_TRUE@LoadPlugin ipc
  #@BUILD_PLUGIN_IPMI_TRUE@LoadPlugin ipmi

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

diff --cc src/types.db
Simple merge