]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'wip-2090'
authorSage Weil <sage@newdream.net>
Thu, 23 Feb 2012 19:16:17 +0000 (11:16 -0800)
committerSage Weil <sage@newdream.net>
Thu, 23 Feb 2012 19:16:17 +0000 (11:16 -0800)
Reviewed-by: Greg Farnum <gregory.farnum@dreamhost.com>

Trivial merge