tree b43f2df60d652477d7708738b5a76140f3440b56
parent 0db323c28d2a716ff9df18b2c306af13cc6973e0
parent f72f9564e7f848ed2fdd3715a5615ecf2782e9ed
author Marco Miller <marco.miller@ericsson.com> 1593728258 -0400
committer Marco Miller <marco.miller@ericsson.com> 1593728258 -0400

Merge branch 'stable-3.2'

* stable-3.2:
  Update git submodules
  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: Ie1c40c20528a23a84a343f04b543fb9ec60ff5c4