Commit 490f0a5

committed

merge conflicts

1 parent d1ab771 commit 490f0a5Copy full SHA for 490f0a5

15 files changed

+16

-1274

lines changed

dev/deps
pom.xml
project
- MimaExcludes.scala
resource-managers/kubernetes
- core/src
  - main/scala/org/apache/spark
    - deploy/k8s
      - KubernetesUtils.scala
      - submit
        KubernetesDriverBuilder.scala
    - scheduler/cluster/k8s
      - KubernetesExecutorBuilder.scala
  - test/scala/org/apache/spark
    - deploy/k8s/submit
      - KubernetesDriverBuilderSuite.scala
    - scheduler/cluster/k8s
      - KubernetesExecutorBuilderSuite.scala
- integration-tests/src/test/scala/org/apache/spark/deploy/k8s/integrationtest
  - KubernetesSuite.scala
sql/core/src
- main/scala/org/apache/spark/sql/execution/datasources/parquet
  - ParquetFileFormat.scala
  - ParquetFilters.scala
- test
  - resources/sql-tests/results
    - describe-part-after-analyze.sql.out
  - scala/org/apache/spark/sql/execution/datasources/parquet
    - ParquetFilterSuite.scala

15 files changed

+16

-1274

lines changed

`‎dev/deps/spark-deps-hadoop-2.6`

This file was deleted.

Comments

(0)