From: Josh Durgin <jdurgin@redhat.com>
Date: Mon, 30 Jan 2017 22:55:45 +0000 (-0800)
Subject: Merge pull request #13098 from wido/doc-osd-greace
X-Git-Tag: v12.0.0~58
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c26f317c7f884f537923dcfcbf119004ab34172e;p=ceph.git

Merge pull request #13098 from wido/doc-osd-greace

doc: Document that osd_heartbeat_grace applies to MON and OSD

Reviewed-by: Joao Eduardo Luis <joao@suse.de>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
---

c26f317c7f884f537923dcfcbf119004ab34172e