tree b20fc2f8c4328bd586d74115395059f2ebc7dd06
parent 3c0a3c30ab004f7c69cc7500d5b9110c83a136a0
parent 68605e80ed44cae1f75e33598c930316df4ecbdc
author Marco Miller <marco.miller@ericsson.com> 1593624745 -0400
committer Marco Miller <marco.miller@ericsson.com> 1593624745 -0400

Merge branch 'stable-3.1' into stable-3.2

* stable-3.1:
  Update git submodules
  Update git submodules
  Update documentation: NoteDb is the only storage format in 3.x
  Update git submodules
  Add max query timeout setting for h2 dialect
  Update git submodules
  Update git submodules
  e2e-tests: Replace value of 1 with reused constant
  e2e-tests: Add CheckMasterBranchReplica1 scenarios

Change-Id: I3abc67206a6c5a45ee5398153be0874440e9c234