]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge remote-tracking branch 'origin/next'
authorJosh Durgin <jdurgin@redhat.com>
Fri, 14 Aug 2015 21:18:12 +0000 (14:18 -0700)
committerJosh Durgin <jdurgin@redhat.com>
Fri, 14 Aug 2015 21:18:12 +0000 (14:18 -0700)

Trivial merge