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

Trivial merge