tree 23b36653d74e43144ad2a782a2b0373f62aa0452
parent c449ba153358150927cb8d88e77f2b3d60d63ecc
parent 40bca4672058b8bce4e897207e82fa172489ee3e
author David Pursehouse <dpursehouse@collab.net> 1562674159 +0900
committer David Pursehouse <dpursehouse@collab.net> 1562674159 +0900

Merge branch 'stable-3.0'

* stable-3.0:
  Add missing log statement if replication was canceled
  When rescheduling due to in-flight push log also the in-flight task ID
  Make sure to always remove in-flight pushes

Change-Id: I7e15a3383d1288376ab0bec8415b071c874dfc53