tree 83097596c3bb0d4b111180d983a7a49280da5e3e
parent 67d83fc4a22fc07bdb89836f875e5e7cf19047c1
parent 747ff43e075485900f18bae8ce6cf68aa1d035fe
author David Pursehouse <dpursehouse@collab.net> 1552954306 +0000
committer David Pursehouse <dpursehouse@collab.net> 1552954306 +0000

Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Upgrade wiremock to 2.22.0
  Upgrade mockito-core to 2.25.1

Change-Id: I533e00935dd479735e50bdab0ef6ba16466dca56