Revert "[SPARK-25299] Put SPARK-25299 changes into master (#606)"

This reverts commit e153f73.
palantir · Jan 25, 2021 · b7f6770 · b7f6770
1 parent 610d65b
commit b7f6770
Show file tree

Hide file tree

Showing 56 changed files with 569 additions and 3,097 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -8,6 +8,7 @@ defaults: &defaults
     TERM: dumb
     BUILD_SBT_CACHE: "/home/circleci/build-sbt-cache"
 
+
 test-defaults: &test-defaults
   <<: *defaults
   environment:
@@ -27,8 +28,8 @@ deployable-branches-and-tags: &deployable-branches-and-tags
     tags:
       only: /[0-9]+(?:\.[0-9]+){2,}-palantir\.[0-9]+(?:\.[0-9]+)*/
     branches:
-      only:
-        - master
+      only: master
+
 
 # Step templates
 

diff --git a/core/src/main/java/org/apache/spark/shuffle/api/MapOutputWriterCommitMessage.java b/core/src/main/java/org/apache/spark/shuffle/api/MapOutputWriterCommitMessage.java
diff --git a/core/src/main/java/org/apache/spark/shuffle/api/ShuffleBlockInfo.java b/core/src/main/java/org/apache/spark/shuffle/api/ShuffleBlockInfo.java
diff --git a/core/src/main/java/org/apache/spark/shuffle/api/ShuffleDataIO.java b/core/src/main/java/org/apache/spark/shuffle/api/ShuffleDataIO.java
diff --git a/core/src/main/java/org/apache/spark/shuffle/api/ShuffleDriverComponents.java b/core/src/main/java/org/apache/spark/shuffle/api/ShuffleDriverComponents.java
diff --git a/core/src/main/java/org/apache/spark/shuffle/api/ShuffleExecutorComponents.java b/core/src/main/java/org/apache/spark/shuffle/api/ShuffleExecutorComponents.java