Github user marmbrus commented on the pull request:
https://github.com/apache/spark/pull/7013#issuecomment-119005476
```
[marmbrus@Michaels-MacBook-Pro-2 spark ((14e4bf8...))]$ git checkout pr/7013
Previous HEAD position was 14e4bf8... Use CanBroadcast in broadcast outer
join planning
Branch pr/7013 set up to track remote branch pr/7013 from origin.
Switched to a new branch 'pr/7013'
[marmbrus@Michaels-MacBook-Pro-2 spark (pr/7013)]$ git merge origin/master
Auto-merging
sql/hive/src/test/scala/org/apache/spark/sql/hive/execution/HiveUDFSuite.scala
Removing sql/hive/src/test/resources/golden/Date comparison test
2-0-dc1b267f1d79d49e6675afe4fd2a34a5
Removing sql/hive/src/test/resources/golden/Date
cast-0-a7cd69b80c77a771a2c955db666be53d
Auto-merging
sql/hive/src/main/scala/org/apache/spark/sql/hive/hiveUDFs.scala
Auto-merging
sql/core/src/test/scala/org/apache/spark/sql/DataFrameSuite.scala
CONFLICT (content): Merge conflict in
sql/core/src/test/scala/org/apache/spark/sql/DataFrameSuite.scala
Auto-merging
sql/core/src/main/scala/org/apache/spark/sql/parquet/newParquet.scala
Auto-merging
sql/core/src/main/scala/org/apache/spark/sql/execution/pythonUDFs.scala
Auto-merging
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/ScalaUDF.scala
Removing sql/catalyst/src/main/java/org/apache/spark/sql/BaseRow.java
Removing sql/catalyst/src/main/java/org/apache/spark/sql/BaseMutableRow.java
Automatic merge failed; fix conflicts and then commit the result.
```
Someone else has added tests to DataFrameSuite.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at [email protected] or file a JIRA ticket
with INFRA.
---
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
