Merge branch 'master' of github.com:apache/spark into SPARK-23375

apache · Apr 11, 2018 · 0cd4899 · 0cd4899
2 parents a1846ab + 271c891
commit 0cd4899
Show file tree

Hide file tree

Showing 822 changed files with 25,238 additions and 13,564 deletions.
diff --git a/.gitignore b/.gitignore
@@ -76,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",