tree 9c1100689a6ba1c9af0f0a8f2e72ddefe99dc3af
parent 4667abbc6435c875fe3953cf2ff1eae5cc286a69
parent 504d693a73ad2e96cd5af7a5c6c2cb10351dc500
author Marco Miller <marco.miller@ericsson.com> 1580052194 -0500
committer Marco Miller <marco.miller@ericsson.com> 1580052194 -0500

Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  Upgrade testcontainers to 1.12.5

Change-Id: Ie017988456930e9aa72d06639c7ae2836ef9cb65