]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #2343 from ceph/wip-9151
authorJohn Spray <john.spray@inktank.com>
Tue, 2 Sep 2014 21:02:59 +0000 (22:02 +0100)
committerJohn Spray <john.spray@inktank.com>
Tue, 2 Sep 2014 21:02:59 +0000 (22:02 +0100)
Wip 9151 + 9152

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

Trivial merge