Skip to content

Commit eee38f2

Browse files
authored
Merge branch 'master' into SPARK-22884
2 parents dc7e708 + 32471ba commit eee38f2

File tree

1,065 files changed

+33599
-15937
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,065 files changed

+33599
-15937
lines changed

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,8 @@ project/plugins/src_managed/
6262
project/plugins/target/
6363
python/lib/pyspark.zip
6464
python/deps
65+
python/test_coverage/coverage_data
66+
python/test_coverage/htmlcov
6567
python/pyspark/python
6668
reports/
6769
scalastyle-on-compile.generated.xml
@@ -74,6 +76,7 @@ streaming-tests.log
7476
target/
7577
unit-tests.log
7678
work/
79+
docs/.jekyll-metadata
7780

7881
# For Hive
7982
TempStatsStore/

R/pkg/NAMESPACE

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,7 @@ exportMethods("arrange",
151151
"registerTempTable",
152152
"rename",
153153
"repartition",
154+
"repartitionByRange",
154155
"rollup",
155156
"sample",
156157
"sample_frac",

0 commit comments

Comments
 (0)