tree cef374972ca32ded427ffd548bbea00401608ba5
parent 6788814843e68b2f824328b560dc5e594739ce03
parent d6cdeb0d2dfe4da2339931b1d281ace2ba38d3dd
author Marco Miller <marco.miller@ericsson.com> 1593626032 -0400
committer Marco Miller <marco.miller@ericsson.com> 1593626032 -0400

Merge branch 'stable-3.2'

* stable-3.2:
  e2e-tests: Replace value of 1 with reused constant
  Use stable-3.2 branch for multi-site local setup

Change-Id: I7cb112123daea7cf234bbd82a6c1ec80d3b2d706