Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

REL-319 REL-320 And catch up with latest Apache 0.9 bugfixes #18

Merged
merged 3 commits into from
Jun 13, 2014

Commits on Jun 13, 2014

  1. [SPARK-1841]: update scalatest to version 2.1.5

    Author: witgo <witgo@qq.com>
    
    Closes apache#713 from witgo/scalatest and squashes the following commits:
    
    b627a6a [witgo] merge master
    51fb3d6 [witgo] merge master
    3771474 [witgo] fix RDDSuite
    996d6f9 [witgo] fix TimeStampedWeakValueHashMap test
    9dfa4e7 [witgo] merge bug
    1479b22 [witgo] merge master
    29b9194 [witgo] fix code style
    022a7a2 [witgo] fix test dependency
    a52c0fa [witgo] fix test dependency
    cd8f59d [witgo] Merge branch 'master' of https://github.com/apache/spark into scalatest
    046540d [witgo] fix RDDSuite.scala
    2c543b9 [witgo] fix ReplSuite.scala
    c458928 [witgo] update scalatest to version 2.1.5
    
    Conflicts:
    	core/pom.xml
    	core/src/test/scala/org/apache/spark/ContextCleanerSuite.scala
    	core/src/test/scala/org/apache/spark/scheduler/DAGSchedulerSuite.scala
    	core/src/test/scala/org/apache/spark/util/TimeStampedHashMapSuite.scala
    	pom.xml
    	project/SparkBuild.scala
    	sql/core/src/test/scala/org/apache/spark/sql/parquet/ParquetQuerySuite.scala
    witgo authored and markhamstra committed Jun 13, 2014
    Configuration menu
    Copy the full SHA
    2b77e24 View commit details
    Browse the repository at this point in the history
  2. Scala version to 2.10.4

    markhamstra committed Jun 13, 2014
    Configuration menu
    Copy the full SHA
    d78615b View commit details
    Browse the repository at this point in the history
  3. scalatest 2.2.0

    markhamstra committed Jun 13, 2014
    Configuration menu
    Copy the full SHA
    02edba5 View commit details
    Browse the repository at this point in the history