From: Patrick Donnelly <pdonnell@redhat.com>
Date: Thu, 14 Jul 2016 16:10:11 +0000 (-0400)
Subject: Merge remote-tracking branch 'upstream/pull/10298/head' into jewel
X-Git-Tag: v10.2.3~116
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d794e295786599102d5ea1a4c10002f4f8d85649;p=ceph.git

Merge remote-tracking branch 'upstream/pull/10298/head' into jewel

* upstream/pull/10298/head:
  doc: fix standby replay config
---

d794e295786599102d5ea1a4c10002f4f8d85649