tree 811680d782c7dd134e479be4fd8722f3c47319ce
parent 7f89635c3abf247e5ecf41fa16205ca09f430790
parent ffbf2f61ef68a26e497cdefd83b98abe6e568f41
author Marco Miller <marco.miller@ericsson.com> 1601066022 -0400
committer Marco Miller <marco.miller@ericsson.com> 1601066022 -0400

Merge branch 'stable-3.1' into stable-3.2

* stable-3.1:
  e2e-test: Rename 'default' after GerritSimulation core change Id33ada17
  e2e-test: Rename 'unique' after GerritSimulation core change I229976f5
  e2e-test: Rename 'name' after GerritSimulation core change I3527fb39

Change-Id: Ie04b3edb3c2747e0a586d7df82dd519f17fece14