tree 67957b5a421ee7cfb5c492637c026d505f7d5c6f
parent f904ea517ec3ddf16a1b28920c5569b4ac5f4d79
parent b8c16385ee50a1996de39851a0420678a9ee45ba
author David Pursehouse <dpursehouse@collab.net> 1583812780 +0900
committer David Pursehouse <dpursehouse@collab.net> 1583812780 +0900

Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  Use Gerrit 2.16.16 in Dockerfile
  Upgrade wiremock to 2.26.3

Change-Id: Iaf37978f25e06e525d9f12013b28a65ffb066abe