]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'wip_4836' into next
authorSamuel Just <sam.just@inktank.com>
Mon, 29 Apr 2013 17:45:20 +0000 (10:45 -0700)
committerSamuel Just <sam.just@inktank.com>
Mon, 29 Apr 2013 17:45:24 +0000 (10:45 -0700)
Fixes: #4836
Reviewed-by: Sage Weil <sage@inktank.com>

Trivial merge