]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #3460 from athanatos/wip-10524
authorSage Weil <sage@redhat.com>
Thu, 22 Jan 2015 19:19:47 +0000 (11:19 -0800)
committerSage Weil <sage@redhat.com>
Thu, 22 Jan 2015 19:19:47 +0000 (11:19 -0800)
Wip 10524

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

Trivial merge