tree 440c7dce74b1d007795814784c085300f6ea6610
parent e18db34a616a8ed7716f15c58005cdc42a0ad107
parent 438293f5ff8bb37f218eda3697dd7b8b54918624
author Marco Miller <marco.miller@ericsson.com> 1622481837 -0400
committer Marco Miller <marco.miller@ericsson.com> 1622481837 -0400

Merge branch 'stable-3.1' into stable-3.2

* stable-3.1:
  e2e-tests: Fix regex to adapt to JSON_COMPACT
  Use Gerrit 3.1.15 in Dockerfile

Change-Id: I041678abf09cac33e08f81c7b2fc6e79f4364bed