]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #6221 from athanatos/wip-13434
authorSage Weil <sage@redhat.com>
Wed, 14 Oct 2015 01:28:25 +0000 (21:28 -0400)
committerSage Weil <sage@redhat.com>
Wed, 14 Oct 2015 01:28:25 +0000 (21:28 -0400)
Wip 13434

Reviewed-by: Sage Weil <sage@redhat.com>

Trivial merge