]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #2799 from athanatos/wip-9480
authorSage Weil <sage@redhat.com>
Fri, 24 Oct 2014 20:20:43 +0000 (13:20 -0700)
committerSage Weil <sage@redhat.com>
Fri, 24 Oct 2014 20:20:43 +0000 (13:20 -0700)
Wip 9480

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

Trivial merge