tree d6689c40c839464d4cbef54a5e9c622638d13b27
parent c07684f89ff14dc099c8c23dce20241b67d307f7
parent 1ac21782e00563385d611761ea07569d9c642fc2
author Marco Miller <marco.miller@ericsson.com> 1600702058 -0400
committer Marco Miller <marco.miller@ericsson.com> 1600702058 -0400

Merge branch 'stable-3.0' into stable-3.1

* stable-3.0:
  e2e-tests: Clarify replication_delay usage in documentation
  e2e-tests: Clarify the documented purpose of uppercase keys in json file
  NoteDbMigrator: Improve log message when saving ref updates
  e2e-tests: Move plugin list documentation to own section for readability
  e2e-tests: Formalize power_factor documentation section for readability
  NoteDbMigrator: fix formatting

Change-Id: Ie33db10f7e2a9ab6b17329d609b4d3b323627a81