]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge remote-tracking branch 'gh/wip-fix-3x'
authorSage Weil <sage@inktank.com>
Sat, 7 Dec 2013 00:56:10 +0000 (16:56 -0800)
committerSage Weil <sage@inktank.com>
Sat, 7 Dec 2013 00:56:10 +0000 (16:56 -0800)
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>

Trivial merge