tree 832be813d8b7519129693ac45b87678577b0cc95
parent b80b7176b0a18024c946d056f29e90b497e44420
parent d8cc3f9e293d4fea1131e23d7ad9fac51d63589b
author David Pursehouse <dpursehouse@collab.net> 1562666843 +0900
committer David Pursehouse <dpursehouse@collab.net> 1562666843 +0900

Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  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: Ia3cff74476f360388d49ee68fc08ed96ab4b03e9