tree c3fd84d9730eb9c17d4c029b4315893b3832c0fa
parent 57ee8678552b74d2323eed5e2425b27e3e2a7d25
parent ba4eabb68bdaeca1b5c2adb0c1585a77a8a4fe84
author David Pursehouse <dpursehouse@collab.net> 1579762683 +0900
committer David Pursehouse <dpursehouse@collab.net> 1579762683 +0900

Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  ReplicationFileBasedConfig: fix UnusedException error from ErrorProne

Change-Id: Ia6142dea1802cb44b83a0b1abb657f4e8510fe8c