fix the merge

jvm-packages/xgboost4j-spark/src/main/scala/ml/dmlc/xgboost4j/scala/spark/XGBoost.scala

@@ -64,7 +64,6 @@ object XGBoost extends Serializable {
       tracker.getWorkerEnvs.asScala, numWorkers, round, obj, eval)
     // force the job
     boosters.foreachPartition(_ => ())
-    println("=====finished training=====")
     val booster = boosters.first()
     val returnVal = tracker.waitFor()
     logger.info(s"Rabit returns with exit code $returnVal")

jvm-packages/xgboost4j-spark/src/test/scala/ml/dmlc/xgboost4j/scala/spark/XGBoostSuite.scala

@@ -130,6 +130,7 @@ class XGBoostSuite extends FunSuite with BeforeAndAfterAll {
       trainingRDD,
       List("eta" -> "1", "max_depth" -> "2", "silent" -> "0",
         "objective" -> "binary:logistic").toMap,
+      new scala.collection.mutable.HashMap[String, String],
       numWorker, 2, null, null)
     val boosterCount = boosterRDD.count()
     assert(boosterCount === numWorker)