]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge remote-tracking branch 'gh/next'
authorSage Weil <sage@redhat.com>
Wed, 10 Jun 2015 17:15:11 +0000 (13:15 -0400)
committerSage Weil <sage@redhat.com>
Wed, 10 Jun 2015 17:15:11 +0000 (13:15 -0400)

Trivial merge