tree b97c1c9966e0b3eb4a7c243e1a234378c4ee1a94
parent a11ba5f8651988b3f7096912402347f01402b197
parent c07684f89ff14dc099c8c23dce20241b67d307f7
author Marco Miller <marco.miller@ericsson.com> 1600379946 -0400
committer Marco Miller <marco.miller@ericsson.com> 1600380059 -0400

Merge branch 'stable-3.1' into stable-3.2

* stable-3.1:
  Documentation: Remove the unsupported dev-contributing linkattrs in 3.1
  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
  Document how to enable git protocol version 2
  MigrateToNoteDb#run: ensure that exceptions are logged

Change-Id: I2f2dbdaebed190d69c4b069b3866e9c7dbfafb6f