]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'wip-encoding'
authorSage Weil <sage@newdream.net>
Fri, 10 Feb 2012 22:39:44 +0000 (14:39 -0800)
committerSage Weil <sage@newdream.net>
Fri, 10 Feb 2012 22:39:44 +0000 (14:39 -0800)
Reviewed-by: Greg Farnum <gregory.farnum@dreamhost.com>

Trivial merge