tree af3547aed477c8a28ea9984e86a327cc6a4f7f35
parent b3606eb38eb8edc166260184177e68386539381a
parent 974dda67f9c4282d6d94af4b2c71e08e26534ab1
author David Pursehouse <dpursehouse@collab.net> 1476866103 +0900
committer David Pursehouse <dpursehouse@collab.net> 1476866148 +0900

Merge branch 'stable-2.13'

* stable-2.13:
  Make SearchingChangeCacheImpl nullable when replicating from slave

Change-Id: I0d23a61100350239432d8eeb701483afe0625fb6