]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge remote-tracking branch 'gh/jewel'
authorSage Weil <sage@redhat.com>
Wed, 23 Dec 2015 22:07:41 +0000 (17:07 -0500)
committerSage Weil <sage@redhat.com>
Wed, 23 Dec 2015 22:07:41 +0000 (17:07 -0500)

Trivial merge