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

Trivial merge