tree aa8d75166d99f0a675bc7e79b00cac451ade22f9
parent e90b5a9366e9103a0af49613d58762de3abdd4ec
parent 1d5883e029ed6871e437459abd3dfbe411de4142
author David Pursehouse <dpursehouse@collab.net> 1548981856 +0900
committer David Pursehouse <dpursehouse@collab.net> 1548981856 +0900

Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Upgrade wiremock to 2.21.0

Change-Id: I3276c970c2155da7c05648fd505ba35fd6fc3b51