Merge branch 'master' of https://github.com/0xdata/h2o

py/testdir_release/c2/test_c2_rel.py

@@ -28,7 +28,6 @@ def sub_c2_rel_long(self):
                 # ("*[1][0-9][0-9].dat.gz", "file_100_A.dat.gz", 100 * avgMichalSize, 3600),
             ]
 
-
         if LOG_MACHINE_STATS:
             benchmarkLogging = ['cpu', 'disk', 'network']
         else:

py/testdir_release/wait_for_h2o_on_hadoop.sh

@@ -1,9 +1,9 @@
-
+#!/bin/bash
 echo ""
 echo "Have to wait until h2o_one_node is available from the cloud build. Deleted it above."
 echo "spin loop here waiting for it."
 
-count=0
+COUNT=0
 rm -fr h2o_one_node
 while [ ! -f h2o_one_node ]
 do
@@ -12,11 +12,10 @@ do
     echo "$REMOTE_SCP $REMOTE_USER:$REMOTE_HOME/h2o_one_node ."
     $REMOTE_SCP $REMOTE_USER:$REMOTE_HOME/h2o_one_node .
     set -e
-    (( count++ ))
-    if [ $count == 100 ]
+    COUNT=$((COUNT + 1))
+    if [ $COUNT == 100 ]
     then
         echo "h2o didn't start on hadoop, after waiting 500 secs"
     fi
 done
 ls -lt h2o_one_node
-

src/main/java/water/fvec/Vec.java

@@ -611,6 +611,8 @@ public static class CollectDomain extends MRTask2<CollectDomain> {
       }
     }
 
+    @Override public void reduce(CollectDomain mrt) { Utils.or(this._dom, mrt._dom); }
+
     /** Returns exact numeric domain of given vector computed by this task.
      * The domain is always sorted. Hence:
      *    domain()[0] - minimal domain value