tree 426145572c7d1c3e695a3d7c1796415bf3610f16
parent 46106cdb2b60e5429f48fcd6bec30b4c1c41bb26
parent 5bf7cbe91fa366d992b9c7eb73e704152d2e51a3
author Marco Miller <marco.miller@ericsson.com> 1600702231 -0400
committer Marco Miller <marco.miller@ericsson.com> 1600702589 -0400

Merge branch 'stable-3.1' into stable-3.2

* stable-3.1:
  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: Ib1fd6c4e61fa2e02d2d81be474b4a54408da07e2