]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge remote-tracking branch 'upstream/wip_osd_shutdown_notification'
authorSamuel Just <sam.just@inktank.com>
Fri, 22 Mar 2013 01:46:50 +0000 (18:46 -0700)
committerSamuel Just <sam.just@inktank.com>
Fri, 22 Mar 2013 01:46:50 +0000 (18:46 -0700)
Fixes: #1857
Fixes: #4267
Reviewed-by: Sage Weil <sage@inktank.com>

Trivial merge