tree e5b1ab436c43b8d9d816cfa4b7abc04987348ee1
parent 6fcdcf98fe61e8c6258fb40967f0cff6b8c38fd4
parent 9547d76a375827d79804704dadf716f47d176f0d
author David Pursehouse <dpursehouse@collab.net> 1562548604 +0900
committer David Pursehouse <dpursehouse@collab.net> 1562548604 +0900

Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  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: I938d5ad49e94865515d8e2fe4694da8a605fb53a