tree d75c9044b724d8a22ea7d908caaf3842a0d393ce
parent d73451aa8b9ae0fcce389462a8242f1c2c6db59f
parent 3cb8b13e7e966a8addb1685de51ac62567b2700e
author Marco Miller <marco.miller@ericsson.com> 1590171912 -0400
committer Marco Miller <marco.miller@ericsson.com> 1590171912 -0400

Merge branch 'stable-3.0' into stable-3.1

* stable-3.0:
  GerritSimulation: Allow scenarios to further customize waits

Change-Id: Icb8fe61adaa33625b70bd3b5b3ac4de668ffab5d