]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge remote-tracking branch 'gh/next'
authorSage Weil <sage@redhat.com>
Mon, 24 Aug 2015 12:35:38 +0000 (08:35 -0400)
committerSage Weil <sage@redhat.com>
Mon, 24 Aug 2015 12:35:38 +0000 (08:35 -0400)

Trivial merge