Merge branch 'scalatest-fix' into upstream-master

This is a re-merge of the (re-based) 'bump scalatest to 2.2.2' branch into master, since I (tdanford) messed up the merge the first time.
bigdatagenomics · Sep 16, 2014 · dc8fc8e · dc8fc8e
2 parents cb7eadc + 08b516f
commit dc8fc8e
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/pom.xml b/pom.xml
@@ -442,7 +442,7 @@
       <dependency>
         <groupId>org.scalatest</groupId>
         <artifactId>scalatest_${scala.artifact.suffix}</artifactId>
-        <version>1.9.2</version>
+        <version>2.2.2</version>
         <scope>test</scope>
       </dependency>
       <dependency>