tree b65093e20b0cfdac3fd1e3e178812fc44e2f197b
parent 08f01cbead9360217d0f56b1b21894db0a8a4159
parent 20e466e71f292901ed25f8c3dd109da2d98c08d0
author Luca Milanesio <luca.milanesio@gmail.com> 1589148160 +0100
committer Luca Milanesio <luca.milanesio@gmail.com> 1589148160 +0100

Merge branch 'stable-3.1'

* stable-3.1:
  Fix extensibility of replication configuration parsing

Change-Id: I57a39ab6ecbdb8cfb6fecf215e805b6e6801f7e7