]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge remote-tracking branch 'gh/wip-asok' into next
authorSage Weil <sage@inktank.com>
Thu, 15 Nov 2012 00:22:27 +0000 (16:22 -0800)
committerSage Weil <sage@inktank.com>
Thu, 15 Nov 2012 00:22:27 +0000 (16:22 -0800)
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>

Trivial merge