resolve merge conflict

apache · hhbyyh · Dec 3, 2016 · Dec 5, 2016 · Dec 5, 2016 · Dec 5, 2016
commit 2a0af1d43891c20a5a8a16a656261f8570cdc90a
diff --git a/mllib/src/main/scala/org/apache/spark/ml/tuning/TrainValidationSplit.scala b/mllib/src/main/scala/org/apache/spark/ml/tuning/TrainValidationSplit.scala
@@ -128,6 +128,7 @@ class TrainValidationSplit @Since("1.5.0") (@Since("1.5.0") override val uid: St
     logInfo(s"Best set of parameters:\n${epm(bestIndex)}")
     logInfo(s"Best train validation split metric: $bestMetric.")
     val bestModel = est.fit(dataset, epm(bestIndex)).asInstanceOf[Model[_]]
+    instr.logSuccess(bestModel)
     val model = copyValues(new TrainValidationSplitModel(uid, bestModel, metrics).setParent(this))
     val summary = new TuningSummary(epm, metrics, bestIndex)
     model.setSummary(Some(summary))
@@ -306,4 +307,3 @@ object TrainValidationSplitModel extends MLReadable[TrainValidationSplitModel] {
     }
   }
 }
-