]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge remote-tracking branch 'gh/next'
authorSage Weil <sage@inktank.com>
Mon, 7 Oct 2013 11:37:20 +0000 (04:37 -0700)
committerSage Weil <sage@inktank.com>
Mon, 7 Oct 2013 11:37:20 +0000 (04:37 -0700)

Trivial merge