]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #4177 from ceph/wip-11226-extra
authorGregory Farnum <greg@gregs42.com>
Fri, 27 Mar 2015 18:27:58 +0000 (11:27 -0700)
committerGregory Farnum <greg@gregs42.com>
Fri, 27 Mar 2015 18:27:58 +0000 (11:27 -0700)
Wip 11226 extra

Reviewed-by: Greg Farnum <gfarnum@redhat.com>

Trivial merge