Skip to content
Prev Previous commit
Next Next commit
Merge remote-tracking branch 'origin/master' into SPARK-10381
  • Loading branch information
JoshRosen committed Sep 15, 2015
commit 4dcb78a2ac77fbfd071b12cf5264d0af347595e7
16 changes: 13 additions & 3 deletions project/MimaExcludes.scala
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,18 @@ object MimaExcludes {
def excludes(version: String) = version match {
case v if v.startsWith("1.6") =>
Seq(
MimaBuild.excludeSparkPackage("network")
) ++ Seq(
MimaBuild.excludeSparkPackage("deploy"),
MimaBuild.excludeSparkPackage("network"),
// These are needed if checking against the sbt build, since they are part of
// the maven-generated artifacts in 1.3.
excludePackage("org.spark-project.jetty"),
MimaBuild.excludeSparkPackage("unused"),
// SQL execution is considered private.
excludePackage("org.apache.spark.sql.execution")
) ++
MimaBuild.excludeSparkClass("streaming.flume.FlumeTestUtils") ++
MimaBuild.excludeSparkClass("streaming.flume.PollingFlumeTestUtils") ++
Seq(
// SPARK-10381 Fix types / units in private AskPermissionToCommitOutput RPC message.
// This class is marked as `private` but MiMa still seems to be confused by the change.
ProblemFilters.exclude[MissingMethodProblem](
Expand Down Expand Up @@ -700,4 +710,4 @@ object MimaExcludes {
MimaBuild.excludeSparkClass("mllib.regression.LinearRegressionWithSGD")
case _ => Seq()
}
}
}
You are viewing a condensed version of this merge commit. You can view the full changes here.