From: Samuel Just <sam.just@inktank.com>
Date: Fri, 22 Mar 2013 01:46:50 +0000 (-0700)
Subject: Merge remote-tracking branch 'upstream/wip_osd_shutdown_notification'
X-Git-Tag: v0.62~191
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f00f3bc4e5db04be036ec737e4ed9d9281f64eb3;p=ceph.git

Merge remote-tracking branch 'upstream/wip_osd_shutdown_notification'

Fixes: #1857
Fixes: #4267
Reviewed-by: Sage Weil <sage@inktank.com>
---

f00f3bc4e5db04be036ec737e4ed9d9281f64eb3