]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
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)
commit0fc847b438666582e1ee53b823dcb89a903df735
tree05b768f8835f49779f2d4ed8856440b2a3bec4d0
parent5001d11079c3a597d1106ad4faf930248404d47a
parent44283e5abe9e3aab1bacc85ec42cd894262bc400
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>
src/mon/OSDMonitor.cc