]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-build.git/commitdiff
Merge branch 'master' into 1.25.17-clean-calamari 623/head
authorGregory Meno <gmeno@redhat.com>
Thu, 26 Jan 2017 04:48:19 +0000 (20:48 -0800)
committerGitHub <noreply@github.com>
Thu, 26 Jan 2017 04:48:19 +0000 (20:48 -0800)

Trivial merge