]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge remote-tracking branch 'gh/jewel'
authorSage Weil <sage@redhat.com>
Sun, 3 Apr 2016 18:28:23 +0000 (14:28 -0400)
committerSage Weil <sage@redhat.com>
Sun, 3 Apr 2016 18:28:23 +0000 (14:28 -0400)

Trivial merge