tree 6bd1f4d957d3c5c067204195928ac3b729c381bb
parent ada673decd7b603734dbbadb31510219fa5b1123
parent 50e3b57294f445a51252c6d858aaf402ea3a24c7
author David Pursehouse <david.pursehouse@sonymobile.com> 1414109946 +0900
committer David Pursehouse <david.pursehouse@sonymobile.com> 1414109946 +0900

Merge branch 'stable-2.10'

* stable-2.10:
  Fix replication_log no longer logging after plugin reload
  Prevent creating repos on extra servers

Conflicts:
	src/main/java/com/googlesource/gerrit/plugins/replication/ReplicationLogFile.java

Change-Id: I9ae0912641fbf59a1e7d0bce924853a709ed47fe