]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge remote-tracking branch 'gh/jewel'
authorSage Weil <sage@redhat.com>
Wed, 20 Jan 2016 21:50:28 +0000 (16:50 -0500)
committerSage Weil <sage@redhat.com>
Wed, 20 Jan 2016 21:50:28 +0000 (16:50 -0500)

Trivial merge