]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge remote-tracking branch 'gh/jewel'
authorSage Weil <sage@redhat.com>
Mon, 8 Feb 2016 22:26:32 +0000 (17:26 -0500)
committerSage Weil <sage@redhat.com>
Mon, 8 Feb 2016 22:26:32 +0000 (17:26 -0500)

Trivial merge