]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge remote-tracking branch 'gh/jewel'
authorSage Weil <sage@redhat.com>
Mon, 28 Mar 2016 16:39:11 +0000 (12:39 -0400)
committerSage Weil <sage@redhat.com>
Mon, 28 Mar 2016 16:39:11 +0000 (12:39 -0400)

Trivial merge