From: Sage Weil <sage@redhat.com>
Date: Sat, 26 May 2018 13:30:34 +0000 (-0500)
Subject: Merge PR #22243 into master
X-Git-Tag: v14.0.1~1270
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0fc847b438666582e1ee53b823dcb89a903df735;p=ceph.git

Merge PR #22243 into master

* refs/pull/22243/head:
	Revert "mon: no delay for single message MSG_ALIVE and MSG_PGTEMP"

Reviewed-by: Gregory Farnum <gfarnum@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
---

0fc847b438666582e1ee53b823dcb89a903df735