tree 86b23811dcb0abc421b8a1edba8271c99a5e5b6d
parent 4afa1c90c23e4dfefd69f834ecca73939c3a1e29
parent 3468929085273a02342e59dff6bea7c2e3d36f03
author Luca Milanesio <luca.milanesio@gmail.com> 1591610259 +0100
committer Luca Milanesio <luca.milanesio@gmail.com> 1591610270 +0100

Merge branch 'stable-3.1' into stable-3.2

* stable-3.1:
  Bump version to v3.1.4 to match Gerrit
  Adopt new replication configuration structure

Bug: Issue 12866
Change-Id: If1ccf95f8e8877c209db7f1dee8745e73d2e616c