]> 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, 30 Jun 2014 23:50:01 +0000 (16:50 -0700)
committerSage Weil <sage@inktank.com>
Mon, 30 Jun 2014 23:50:01 +0000 (16:50 -0700)

Trivial merge