]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #4029 from dachary/wip-9910-giant
authorSage Weil <sage@redhat.com>
Tue, 17 Mar 2015 17:47:08 +0000 (10:47 -0700)
committerSage Weil <sage@redhat.com>
Tue, 17 Mar 2015 17:47:08 +0000 (10:47 -0700)
msg/Pipe: discard delay queue before incoming queue

Reviewed-by: Greg Farnum <gfarnum@redhat.com>

Trivial merge