]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge remote-tracking branch 'gh/infernalis'
authorSage Weil <sage@redhat.com>
Mon, 9 Nov 2015 20:50:47 +0000 (15:50 -0500)
committerSage Weil <sage@redhat.com>
Mon, 9 Nov 2015 20:50:47 +0000 (15:50 -0500)

Trivial merge