Skip to content

Commit

Permalink
Re-enabling parallel test runs now that the migration issue is fixed
Browse files Browse the repository at this point in the history
(However it seems like `parallelExecution in Test := false` didn't
actually have any effect)
  • Loading branch information
manuelkiessling committed Jan 12, 2016
1 parent d5deb30 commit ea23128
Showing 1 changed file with 0 additions and 1 deletion.
1 change: 0 additions & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ val commonSettings = Seq(
javacOptions := Seq("-source", "1.8", "-target", "1.8"),
scalaVersion := "2.11.7",
scalacOptions := Seq("-target:jvm-1.8", "-unchecked", "-deprecation", "-encoding", "utf8"),
parallelExecution in Test := false,
// stole the following from https://github.com/datastax/spark-cassandra-connector/pull/858/files
// in order to avoid assembly merge errors with netty
assemblyMergeStrategy in assembly <<= (mergeStrategy in assembly) { (old) =>
Expand Down

0 comments on commit ea23128

Please sign in to comment.