Merge branch 'master' into SPARK-35062

apache · May 8, 2021 · c893aa5 · c893aa5
2 parents d2a12b6 + f47e0f8
commit c893aa5
Show file tree

Hide file tree

Showing 41 changed files with 4,171 additions and 2,513 deletions.
diff --git a/.gitignore b/.gitignore
@@ -54,6 +54,7 @@ sql/docs
 sql/site
 lib_managed/
 lint-r-report.log
+lint-js-report.log
 log/
 logs/
 out/
@@ -105,3 +106,6 @@ spark-warehouse/
 
 # For SBT
 .jvmopts
+
+# For Node.js
+node_modules