]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'wip-clsrbd'
authorSage Weil <sage@inktank.com>
Tue, 19 Jun 2012 22:19:21 +0000 (15:19 -0700)
committerSage Weil <sage@inktank.com>
Tue, 19 Jun 2012 22:19:21 +0000 (15:19 -0700)
Reviewed-by: Greg Farnum <greg@inktank.com>
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>

Trivial merge