From: Sage Weil Date: Tue, 17 Mar 2015 17:47:08 +0000 (-0700) Subject: Merge pull request #4029 from dachary/wip-9910-giant X-Git-Tag: v0.87.2~37 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=bc1b9d22d29a74e6853834fb0430e8803710bbbf;p=ceph.git Merge pull request #4029 from dachary/wip-9910-giant msg/Pipe: discard delay queue before incoming queue Reviewed-by: Greg Farnum --- bc1b9d22d29a74e6853834fb0430e8803710bbbf