]> 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, 9 Mar 2016 20:45:38 +0000 (15:45 -0500)
committerSage Weil <sage@redhat.com>
Wed, 9 Mar 2016 20:45:38 +0000 (15:45 -0500)

Trivial merge