]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'wip-stripe-gran'
authorNoah Watkins <noahwatkins@gmail.com>
Tue, 8 Jan 2013 00:14:16 +0000 (16:14 -0800)
committerNoah Watkins <noahwatkins@gmail.com>
Tue, 8 Jan 2013 00:14:16 +0000 (16:14 -0800)
Reviewed-by: Greg Farnum <greg@inktank.com>

Trivial merge