tree b15c06667fbb32fcc3b32fb0d1a6ac46db0c8292
parent 243abc7631bc633d38d27c5e5f8eabc7b51b6b36
parent 730fb807e5f5ceb814ac309e719e66c802d06ce7
author David Pursehouse <dpursehouse@collab.net> 1548983301 +0900
committer David Pursehouse <dpursehouse@collab.net> 1548983301 +0900

Merge branch 'stable-2.16'

* stable-2.16:
  Upgrade wiremock to 2.21.0

Change-Id: I248c1fdc432af0fed149d76fa895f5259d43ad5b