]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'wip-2007'
authorSage Weil <sage@newdream.net>
Fri, 24 Feb 2012 20:00:00 +0000 (12:00 -0800)
committerSage Weil <sage@newdream.net>
Fri, 24 Feb 2012 20:00:00 +0000 (12:00 -0800)
Reviewed-by: Josh Durgin <josh.durgin@dreamhost.com>

Trivial merge