]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #22243 into master
authorSage Weil <sage@redhat.com>
Sat, 26 May 2018 13:30:34 +0000 (08:30 -0500)
committerSage Weil <sage@redhat.com>
Sat, 26 May 2018 13:30:34 +0000 (08:30 -0500)
* 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>
1  2 
src/mon/OSDMonitor.cc

Simple merge