Merge branch 'stable-3.1'

* stable-3.1:
  Don't reset storage when rescheduling for collisions

Change-Id: I395aedd271fdadf2aaeabcfb740f81cf42c0c33a

src/main/java/com/googlesource/gerrit/plugins/replication/Destination.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/replication/Destination.java b/src/main/java/com/googlesource/gerrit/plugins/replication/Destination.java
index 4aa74c7..d53b9c0 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/replication/Destination.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/replication/Destination.java
@@ -533,7 +533,6 @@
         pending.put(uri, pushOp);
         switch (reason) {
           case COLLISION:
-            replicationTasksStorage.get().reset(pushOp);
             @SuppressWarnings("unused")
             ScheduledFuture<?> ignored =
                 pool.schedule(pushOp, config.getRescheduleDelay(), TimeUnit.SECONDS);