tree fae2de8f5956c8262e80f78f53a25702dd928c97
parent ff26c9690c2be333cdc35a50fa2228626d162ef3
parent e9fb68ce30f1b72f18f841678e3f7d2278524bba
author David Pursehouse <dpursehouse@collab.net> 1548982827 +0900
committer David Pursehouse <dpursehouse@collab.net> 1548982827 +0900

Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Upgrade wiremock to 2.21.0

Change-Id: I927e91d95308d8b2d1227db0b4e4cd1d197f1b42