Merge branch 'stable-3.1'

* stable-3.1:
  Do not remove replication tasks if they are retrying

Change-Id: I5cbdcd29541f6d88fe93364cc4769b93123138b5

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 d53b9c0..38cc9e0 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/replication/Destination.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/replication/Destination.java
@@ -584,7 +584,9 @@
 
   void notifyFinished(PushOne op) {
     synchronized (stateLock) {
-      replicationTasksStorage.get().finish(op);
+      if (!op.isRetrying()) {
+        replicationTasksStorage.get().finish(op);
+      }
       inFlight.remove(op.getURI());
     }
   }