tree 66f2228ea8301cf56bef09f27b0abfc32edc457a
parent bf7ca5a2269d06eec9a160694c8e64f1a0ac8b80
parent 475724c5b714dab44c8ec03dc60767d33508ddca
author Marco Miller <marco.miller@ericsson.com> 1600371851 -0400
committer Marco Miller <marco.miller@ericsson.com> 1600371857 -0400

Merge branch 'stable-3.0' into stable-3.1

* stable-3.0:
  e2e-tests: Add gc-conductor to list of plugins using this test framework
  Refine protocol assignment in scenarios using multiple protocols
  e2e-tests: Add a CheckNewProjectReplica1 scenario
  MigrateToNoteDb#run: ensure that exceptions are logged

Change-Id: I37058150923c60403f396d1b23b6fccf2b7b4df8