Merge branch 'v1.5' into master

2018-01-24 11:57:06 +01:00
parent fb4ba7af2b 4afb39778a
commit c8446c2dc8
40 changed files with 493 additions and 234 deletions
--- a/script/test-integration
+++ b/script/test-integration
@@ -4,7 +4,7 @@ set -e
 export SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 export DEST=.

-TESTFLAGS="${TESTFLAGS} -test.timeout=9m -check.v"
+TESTFLAGS="${TESTFLAGS} -test.timeout=20m -check.v"

 if [ -n "$VERBOSE" ]; then
    TESTFLAGS="${TESTFLAGS} -v"