tree 087b9fae89d7ae6389d950de69faa3821cfed01b
parent 430d484b719704c3b811dda998d0a6e9b37dcd87
parent 3d6bc7fca998dd6ffaea290471929433b4819323
author David Pursehouse <dpursehouse@collab.net> 1571881088 +0900
committer David Pursehouse <dpursehouse@collab.net> 1571881088 +0900

Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Use vanilla high-availability plugin in Docker test

Change-Id: Ib0fba0ea26490aa8c9a05af149b8f49d5aff4752