[SQL] Update SparkSQL and ScalaTest in branch-1.0 to match master. #1078
Conversation
|
Merged build triggered. |
|
Merged build started. |
|
Merged build finished. |
|
Refer to this link for build results: https://amplab.cs.berkeley.edu/jenkins/job/SparkPullRequestBuilder/15770/ |
|
Merged build triggered. |
|
Merged build started. |
|
Merged build finished. |
|
Refer to this link for build results: https://amplab.cs.berkeley.edu/jenkins/job/SparkPullRequestBuilder/15771/ |
Author: witgo <[email protected]> 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
|
Merged build triggered. |
|
Merged build started. |
|
There were some compilation errors. |
|
Merged build finished. All automated tests passed. |
|
All automated tests passed. |
marmbrus
changed the title
#511 and #863 got left out of branch-1.0 since we were really close to the release. Now that they have been tested a little I see no reason to leave them out. Author: Michael Armbrust <[email protected]> Author: witgo <[email protected]> Closes #1078 from marmbrus/branch-1.0 and squashes the following commits: 22be674 [witgo] [SPARK-1841]: update scalatest to version 2.1.5 fc8fc79 [Michael Armbrust] Include #1071 as well. c5d0adf [Michael Armbrust] Update SparkSQL in branch-1.0 to match master.
|
This looks good. I merged it. Note that the only thing that is remotely scary is we are bumping the version of scalatest. However, that only affects development and doesn't change the binary build at all. |
|
FYI Bumping all the way to the current scalatest 2.2.0 also works. |
…1078) * [CARMEL-6174][FOLLOWUP] Change prefer shuffled hash join condition
* EZAF-1127 Minor fix of container startup time by improvement in configure.sh / fix for Spark 3.3.2 * Improve changePermission function in configure.sh * [classpathfilter] Add classpathfilter go module (apache#1078) * Add classpathfilter go module * Properly copy classpathfilter into distribution * Update bin/mapr-classpath.sh * Change content of dep-blacklist.txt (apache#1079)
#511 and #863 got left out of branch-1.0 since we were really close to the release. Now that they have been tested a little I see no reason to leave them out.