]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge remote-tracking branch 'gh/luminous'
authorSage Weil <sage@redhat.com>
Tue, 18 Jul 2017 17:52:09 +0000 (13:52 -0400)
committerSage Weil <sage@redhat.com>
Tue, 18 Jul 2017 17:52:09 +0000 (13:52 -0400)

Trivial merge