Merging upstream version 1.11.1+dfsg

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

2 files changed, 13 insertions, 13 deletions

diff --git a/configure b/configure
index cbcc0a1ee..da5c6bf60 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for netdata 1.11.0_rolling.
+# Generated by GNU Autoconf 2.69 for netdata 1.11.1_rolling.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -577,8 +577,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='netdata'
 PACKAGE_TARNAME='netdata'
-PACKAGE_VERSION='1.11.0_rolling'
-PACKAGE_STRING='netdata 1.11.0_rolling'
+PACKAGE_VERSION='1.11.1_rolling'
+PACKAGE_STRING='netdata 1.11.1_rolling'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -1376,7 +1376,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures netdata 1.11.0_rolling to adapt to many kinds of systems.
+\`configure' configures netdata 1.11.1_rolling to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1446,7 +1446,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of netdata 1.11.0_rolling:";;
+     short | recursive ) echo "Configuration of netdata 1.11.1_rolling:";;
    esac
   cat <<\_ACEOF
 
@@ -1589,7 +1589,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-netdata configure 1.11.0_rolling
+netdata configure 1.11.1_rolling
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2367,7 +2367,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by netdata $as_me 1.11.0_rolling, which was
+It was created by netdata $as_me 1.11.1_rolling, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2752,7 +2752,7 @@ $as_echo "$as_me: ***************** MAINTAINER MODE *****************" >&6;}
 PACKAGE_BUILT_DATE=$(date '+%d %b %Y')
 fi
 
-PACKAGE_RPM_VERSION="1.10.1"
+PACKAGE_RPM_VERSION="1.11.0"
 
 
 
@@ -3283,7 +3283,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='netdata'
- VERSION='1.11.0_rolling'
+ VERSION='1.11.1_rolling'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -8658,7 +8658,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by netdata $as_me 1.11.0_rolling, which was
+This file was extended by netdata $as_me 1.11.1_rolling, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -8724,7 +8724,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-netdata config.status 1.11.0_rolling
+netdata config.status 1.11.1_rolling
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index 2a7337379..06e3bf7af 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5,8 +5,8 @@
 AC_PREREQ(2.60)
 
 define([VERSION_MAJOR], [1])
-define([VERSION_MINOR], [10])
-define([VERSION_FIX], [1])
+define([VERSION_MINOR], [11])
+define([VERSION_FIX], [0])
 define([VERSION_NUMBER], VERSION_MAJOR[.]VERSION_MINOR[.]VERSION_FIX)
 define([VERSION_SUFFIX], [_rolling])