Merge branch '2.1' into develop

2017-06-14 13:59:18 +03:00
parent 121284df46 4c9fc1a39e
commit 17c0bf7dec
15 changed files with 210 additions and 157 deletions
--- a/BUILD/install_build_deps.sh
+++ b/BUILD/install_build_deps.sh
@ -154,7 +154,7 @@ then
    echo "Error getting avro-c"
    exit 1
 fi
-avro_filename=`ls -1 *.tar.gz`
+avro_filename=`ls -1 avro*.tar.gz`
 avro_dir=`echo "$avro_filename" | sed "s/.tar.gz//"`
 tar -axf $avro_filename
 mkdir $avro_dir/build