Merge pull request #5 from danielli90/branch-1.6

Branch 1.6
MobiusForSpark · Mar 17, 2016 · 95f34f1 · 95f34f1
2 parents e52fa84 + 55d76d0
commit 95f34f1
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 184 deletions.
diff --git a/examples/pom.xml b/examples/pom.xml
@@ -81,11 +81,11 @@
       <artifactId>spark-streaming-flume_${scala.binary.version}</artifactId>
       <version>${project.version}</version>
     </dependency>
-    <dependency>
+    <!--<dependency>
       <groupId>org.apache.spark</groupId>
       <artifactId>spark-streaming-mqtt_${scala.binary.version}</artifactId>
       <version>${project.version}</version>
-    </dependency>
+    </dependency>-->
     <dependency>
       <groupId>org.apache.spark</groupId>
       <artifactId>spark-streaming-zeromq_${scala.binary.version}</artifactId>

diff --git a/examples/src/main/python/streaming/mqtt_wordcount.py b/examples/src/main/python/streaming/mqtt_wordcount.py
diff --git a/examples/src/main/scala/org/apache/spark/examples/streaming/MQTTWordCount.scala b/examples/src/main/scala/org/apache/spark/examples/streaming/MQTTWordCount.scala
diff --git a/make-distribution.sh b/make-distribution.sh
@@ -173,25 +173,27 @@ BUILD_COMMAND=("$MVN" clean package -DskipTests $@)
 echo -e "\nBuilding with..."
 echo -e "\$ ${BUILD_COMMAND[@]}\n"
 
-#"${BUILD_COMMAND[@]}"
+# "${BUILD_COMMAND[@]}"
 "${BUILD_COMMAND[@]}" &> "$HOME/sparkbuild.log" &
 
+# echo "BUILD SUCCEEDED!!!"
+
 build_pid=$!
 COUNTER=0
 while ps | grep " $build_pid "
 do
-  let COUNTER=COUNTER+1
+let COUNTER=COUNTER+1
   echo "$(date), counter:$COUNTER - $build_pid is still in the ps output. Must still be running."
   sleep 1m
 done
 
 echo Oh, it looks like the build process is done.
+echo tail -100 "$HOME/sparkbuild.log"
+tail -100 "$HOME/sparkbuild.log"
 wait $build_pid
 build_status=$?
 echo The exit status of the build process was $build_status
 
-tail -100 "$HOME/sparkbuild.log"
-
 # Make directories
 rm -rf "$DISTDIR"
 mkdir -p "$DISTDIR/lib"