]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #706 from ceph/wip-6059
authorSage Weil <sage@inktank.com>
Tue, 15 Oct 2013 17:27:56 +0000 (10:27 -0700)
committerSage Weil <sage@inktank.com>
Tue, 15 Oct 2013 17:27:56 +0000 (10:27 -0700)
Wip 6059

Partly-reviewed-by: Greg Farnum <greg@inktank.com>
Partly-reviewed-by: Sage Weil <sage@inktank.com>

Trivial merge