Merge branch 'master' into SPARK-22362

apache · Apr 9, 2018 · 93aa930 · 93aa930
2 parents a0e14cc + 32471ba
commit 93aa930
Show file tree

Hide file tree

Showing 1,065 changed files with 33,597 additions and 15,938 deletions.
diff --git a/.gitignore b/.gitignore
@@ -62,6 +62,8 @@ project/plugins/src_managed/
 project/plugins/target/
 python/lib/pyspark.zip
 python/deps
+python/test_coverage/coverage_data
+python/test_coverage/htmlcov
 python/pyspark/python
 reports/
 scalastyle-on-compile.generated.xml
@@ -74,6 +76,7 @@ streaming-tests.log
 target/
 unit-tests.log
 work/
+docs/.jekyll-metadata
 
 # For Hive
 TempStatsStore/

diff --git a/R/pkg/NAMESPACE b/R/pkg/NAMESPACE
@@ -151,6 +151,7 @@ exportMethods("arrange",
               "registerTempTable",
               "rename",
               "repartition",
+              "repartitionByRange",
               "rollup",
               "sample",
               "sample_frac",