]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge remote branch 'origin/wip-misc'
authorJosh Durgin <josh.durgin@inktank.com>
Thu, 17 May 2012 20:06:26 +0000 (13:06 -0700)
committerJosh Durgin <josh.durgin@inktank.com>
Thu, 17 May 2012 20:06:45 +0000 (13:06 -0700)
Reviewed-by: Sage Weil <sage@inktank.com>

Trivial merge