]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #7178 from dachary/wip-14285-hammer
authorSage Weil <sage@redhat.com>
Thu, 14 Jan 2016 14:20:53 +0000 (09:20 -0500)
committerSage Weil <sage@redhat.com>
Thu, 14 Jan 2016 14:20:53 +0000 (09:20 -0500)
hammer: osd/OSD.cc: 2469: FAILED assert(pg_stat_queue.empty()) on shutdown

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

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