]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge remote-tracking branch 'gh/wip-3714-b' into next
authorSage Weil <sage@inktank.com>
Thu, 3 Jan 2013 20:53:07 +0000 (12:53 -0800)
committerSage Weil <sage@inktank.com>
Thu, 3 Jan 2013 20:53:07 +0000 (12:53 -0800)
Signed-off-by: Samuel Just <sam.just@inktank.com>

Trivial merge