]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge remote-tracking branch 'gh/jewel'
authorSage Weil <sage@redhat.com>
Mon, 21 Mar 2016 15:37:33 +0000 (11:37 -0400)
committerSage Weil <sage@redhat.com>
Mon, 21 Mar 2016 15:37:33 +0000 (11:37 -0400)

Trivial merge