Skip to content

Commit 372588f

Browse files
committed
Merge branch 'branch-1.6' into SPARK-13359
2 parents 30655f5 + 16f35c4 commit 372588f

File tree

1,079 files changed

+74506
-17683
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,079 files changed

+74506
-17683
lines changed

.gitignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ spark-tests.log
5050
streaming-tests.log
5151
dependency-reduced-pom.xml
5252
.ensime
53+
.ensime_cache/
5354
.ensime_lucene
5455
checkpoint
5556
derby.log
@@ -74,3 +75,7 @@ metastore/
7475
warehouse/
7576
TempStatsStore/
7677
sql/hive-thriftserver/test_warehouses
78+
79+
# For R session data
80+
.RHistory
81+
.RData

.rat-excludes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,3 +83,4 @@ gen-java.*
8383
.*avpr
8484
org.apache.spark.sql.sources.DataSourceRegister
8585
.*parquet
86+
spark-deps-.*

0 commit comments

Comments
 (0)