tree 129d1ae98e8b7b972d4b406813c98a1ca44791aa
parent f7845597fffa6a490161ea2f1ebb5cddbc7b8a1f
parent 9481b913eb31a1115c4179690ccab6cce7d59a90
author Marco Miller <marco.miller@ericsson.com> 1570046672 -0400
committer Marco Miller <marco.miller@ericsson.com> 1570046672 -0400

Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Upgrade wiremock to 2.25.0
  Upgrade bazlets to latest stable-2.15 to build with 2.15.17 API

Change-Id: I423e639af3a8fa861ee125341b59127a7fc7cd73