tree 13d0eb5fd45a548e7f6a89ac09f2eb7b120970ce
parent 3576a392453751cc7882261ebc7e44406f99f2d1
parent 5099fe9a3e7bf59a22acc0c9fddb78787ffcc638
author David Pursehouse <dpursehouse@collab.net> 1555394863 +0900
committer David Pursehouse <dpursehouse@collab.net> 1555394863 +0900

Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Upgrade wiremock to 2.23.2

Change-Id: I95a5a5a81fb11c66e5644ddf29a57f6626d62487