]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge remote-tracking branch 'gh/luminous'
authorSage Weil <sage@redhat.com>
Wed, 8 Feb 2017 19:02:43 +0000 (14:02 -0500)
committerSage Weil <sage@redhat.com>
Wed, 8 Feb 2017 19:02:43 +0000 (14:02 -0500)

Trivial merge