Github user dbtsai commented on a diff in the pull request: https://github.com/apache/spark/pull/1425#discussion_r15443103 --- Diff: mllib/src/test/scala/org/apache/spark/mllib/clustering/KMeansSuite.scala --- @@ -40,27 +41,51 @@ class KMeansSuite extends FunSuite with LocalSparkContext { // No matter how many runs or iterations we use, we should get one cluster, // centered at the mean of the points +<<<<<<< HEAD --- End diff -- Tried to rebase against master with conflicts. I addressed them in the next push.
--- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. ---