]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'wip-bluestore'
authorSage Weil <sage@redhat.com>
Mon, 18 Jan 2016 14:53:02 +0000 (09:53 -0500)
committerSage Weil <sage@redhat.com>
Mon, 18 Jan 2016 14:53:02 +0000 (09:53 -0500)

Trivial merge