tree 495b4928902980fc2b5ca8fa666ad3f619ad352d
parent 5e9129e14c3f8107d042c72a0048cec8a80ee3b5
parent 7f2088effc7174ee4038555f7c157f91285e2d7c
author Marcin Czech <maczech@gmail.com> 1704447511 +0100
committer Marcin Czech <maczech@gmail.com> 1704447511 +0100

Merge branch 'stable-3.7' into stable-3.8

* stable-3.7:
  Pull-replication plugin should warn about inconsistent timeouts

Change-Id: I11450480b6d4001965d83a5386942432c21c9f10