]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #7577 from dachary/wip-14689-hammer
authorSage Weil <sage@redhat.com>
Wed, 24 Feb 2016 18:14:37 +0000 (10:14 -0800)
committerSage Weil <sage@redhat.com>
Wed, 24 Feb 2016 18:14:37 +0000 (10:14 -0800)
hammer: consume_maps clearing of waiting_for_pg needs to check the spg_t shard for acting set membership

1  2 
src/osd/OSDMap.h

Simple merge