Merge branch 'collectd-5.4'

Conflicts:
	configure.ac
	src/dbi.c
	src/utils_latency.c

diff --cc ChangeLog
Simple merge

diff --cc configure.ac
index dc61f05df9592176628b603fe91cd006aac2825b,b075174ee2ac2d3d824ca1bcad997bcedf7b8ebc..c83805e3b1c46790935cf182b15998c860c9a08b
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -5772,14 -5437,13 +5772,15 @@@ Configuration
    Libraries:
      intel mic . . . . . . $with_mic
      libaquaero5 . . . . . $with_libaquaero5
 -    libcredis . . . . . . $with_libcredis
 +    libatasmart . . . . . $with_libatasmart
      libcurl . . . . . . . $with_libcurl
      libdbi  . . . . . . . $with_libdbi
-     libhiredis  . . . . . $with_libhiredis
      libesmtp  . . . . . . $with_libesmtp
      libganglia  . . . . . $with_libganglia
      libgcrypt . . . . . . $with_libgcrypt
+     libhal  . . . . . . . $with_libhal
++    libhiredis  . . . . . $with_libhiredis
 +    libi2c-dev  . . . . . $with_libi2c
      libiokit  . . . . . . $with_libiokit
      libiptc . . . . . . . $with_libiptc
      libjvm  . . . . . . . $with_java
@@@ -5834,16 -5496,14 +5836,16 @@@
      amqp    . . . . . . . $enable_amqp
      apache  . . . . . . . $enable_apache
      apcups  . . . . . . . $enable_apcups
--    aquaero . . . . . . . $enable_aquaero
      apple_sensors . . . . $enable_apple_sensors
++    aquaero . . . . . . . $enable_aquaero
      ascent  . . . . . . . $enable_ascent
 +    barometer . . . . . . $enable_barometer
      battery . . . . . . . $enable_battery
      bind  . . . . . . . . $enable_bind
 +    ceph  . . . . . . . . $enable_ceph
++    cgroups . . . . . . . $enable_cgroups
      conntrack . . . . . . $enable_conntrack
      contextswitch . . . . $enable_contextswitch
--    cgroups . . . . . . . $enable_cgroups
      cpu . . . . . . . . . $enable_cpu
      cpufreq . . . . . . . $enable_cpufreq
      csv . . . . . . . . . $enable_csv
@@@ -5869,10 -5528,10 +5871,10 @@@
      ipvs  . . . . . . . . $enable_ipvs
      irq . . . . . . . . . $enable_irq
      java  . . . . . . . . $enable_java
 -    libvirt . . . . . . . $enable_libvirt
      load  . . . . . . . . $enable_load
      logfile . . . . . . . $enable_logfile
-     lpar  . . . . . . . . $enable_lpar
 +    log_logstash  . . . . $enable_log_logstash
+     lpar  . . . . . . . . $enable_lpar
      lvm . . . . . . . . . $enable_lvm
      madwifi . . . . . . . $enable_madwifi
      match_empty_counter . $enable_match_empty_counter
@@@ -5926,8 -5583,8 +5928,8 @@@
      swap  . . . . . . . . $enable_swap
      syslog  . . . . . . . $enable_syslog
      table . . . . . . . . $enable_table
--    tail  . . . . . . . . $enable_tail
      tail_csv  . . . . . . $enable_tail_csv
++    tail  . . . . . . . . $enable_tail
      tape  . . . . . . . . $enable_tape
      target_notification . $enable_target_notification
      target_replace  . . . $enable_target_replace

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

diff --cc src/daemon/plugin.c
Simple merge

diff --cc src/dbi.c
index 7fec73c549c5249feef63ae4dd194a3071aa3ab6,2d3f566f1f6fc7f52a0e76a3b0bec7945619c77c..a7963ea223371f5d70a4ef63f2d0a3a6263db22a
--- 1/src/dbi.c
--- 2/src/dbi.c
+++ b/src/dbi.c
@@@ -1,24 -1,19 +1,24 @@@
  /**
   * collectd - src/dbi.c
-  * Copyright (C) 2008-2013  Florian octo Forster
+  * Copyright (C) 2008-2015  Florian octo Forster
   *
 - * This program is free software; you can redistribute it and/or modify it
 - * under the terms of the GNU General Public License as published by the
 - * Free Software Foundation; only version 2 of the License is applicable.
 + * Permission is hereby granted, free of charge, to any person obtaining a
 + * copy of this software and associated documentation files (the "Software"),
 + * to deal in the Software without restriction, including without limitation
 + * the rights to use, copy, modify, merge, publish, distribute, sublicense,
 + * and/or sell copies of the Software, and to permit persons to whom the
 + * Software is furnished to do so, subject to the following conditions:
   *
 - * This program is distributed in the hope that it will be useful, but
 - * WITHOUT ANY WARRANTY; without even the implied warranty of
 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 - * General Public License for more details.
 + * The above copyright notice and this permission notice shall be included in
 + * all copies or substantial portions of the Software.
   *
 - * You should have received a copy of the GNU General Public License along
 - * with this program; if not, write to the Free Software Foundation, Inc.,
 - * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 + * DEALINGS IN THE SOFTWARE.
   *
   * Authors:
   *   Florian octo Forster <octo at collectd.org>

diff --cc src/exec.c
Simple merge

diff --cc src/utils_latency.c
Simple merge

diff --cc version-gen.sh
index 6b5e40e5c90cbfd883b5a810005b8cbfd9a436b8,c2c0f6196f733f8418aef5dce71cb09c72dafc61..e2519508d11882b7b392fdbe510d0f10e18b4478
--- 1/version-gen.sh
--- 2/version-gen.sh
+++ b/version-gen.sh
@@@ -1,8 -1,8 +1,8 @@@
  #!/usr/bin/env bash
  
- DEFAULT_VERSION="5.4.1.git"
+ DEFAULT_VERSION="5.4.2.git"
  
 -VERSION="`git describe 2> /dev/null | sed -e 's/^collectd-//'`"
 +VERSION="`git describe 2> /dev/null | grep collectd | sed -e 's/^collectd-//'`"
  
  if test -z "$VERSION"; then
        VERSION="$DEFAULT_VERSION"