tree ae99cbce164ac20ecf257335b2ba196b90a47f2e
parent a4bc8c5375622884822393a7e63883fc1a1dd4ba
parent 52aa50ae1657ced4773b2ad6ed188dcc0ca37dd9
author Marco Miller <marco.miller@ericsson.com> 1590171969 -0400
committer Marco Miller <marco.miller@ericsson.com> 1590171969 -0400

Merge branch 'stable-3.1' into stable-3.2

* stable-3.1:
  Update git submodules
  GerritSimulation: Allow scenarios to further customize waits

Change-Id: I92e78c68f3f36d3e75a916c9a5897767502b4542