]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #6013 from athanatos/wip-12828
authorSage Weil <sage@redhat.com>
Mon, 21 Sep 2015 18:43:55 +0000 (14:43 -0400)
committerSage Weil <sage@redhat.com>
Mon, 21 Sep 2015 18:43:55 +0000 (14:43 -0400)
Wip 12828

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

Trivial merge