]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge remote-tracking branch 'upstream/pull/10298/head' into jewel
authorPatrick Donnelly <pdonnell@redhat.com>
Thu, 14 Jul 2016 16:10:11 +0000 (12:10 -0400)
committerPatrick Donnelly <pdonnell@redhat.com>
Thu, 14 Jul 2016 16:10:11 +0000 (12:10 -0400)
* upstream/pull/10298/head:
  doc: fix standby replay config


Trivial merge