]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #6121 from athanatos/wip-13199
authorSage Weil <sage@redhat.com>
Wed, 30 Sep 2015 00:24:41 +0000 (20:24 -0400)
committerSage Weil <sage@redhat.com>
Wed, 30 Sep 2015 00:24:41 +0000 (20:24 -0400)
OSDService::agent_entry: don't use PG::operator<< without pg lock

Reviewed-by: Sage Weil <sage@redhat.com>
1  2 
src/osd/OSD.cc

diff --cc src/osd/OSD.cc
Simple merge