]> git.apps.os.sepia.ceph.com Git - ceph-build.git/commitdiff
Merge branch 'master' into wip-bz-mill 685/head
authorGregory Meno <gmeno@redhat.com>
Fri, 21 Apr 2017 23:39:39 +0000 (16:39 -0700)
committerGitHub <noreply@github.com>
Fri, 21 Apr 2017 23:39:39 +0000 (16:39 -0700)

Trivial merge