]> git.apps.os.sepia.ceph.com Git - ceph-build.git/commitdiff
Merge branch 'master' into wip-nfs-ganesha-trigger 639/head
authorAli Maredia <amaredia@redhat.com>
Thu, 23 Feb 2017 18:39:52 +0000 (13:39 -0500)
committerGitHub <noreply@github.com>
Thu, 23 Feb 2017 18:39:52 +0000 (13:39 -0500)

Trivial merge