]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge remote-tracking branch 'origin/wip-6936' into firefly
authorJosh Durgin <josh.durgin@inktank.com>
Fri, 21 Feb 2014 21:10:47 +0000 (13:10 -0800)
committerJosh Durgin <josh.durgin@inktank.com>
Fri, 21 Feb 2014 21:10:47 +0000 (13:10 -0800)
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>

Trivial merge