]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
Merge pull request #1476 from ceph/wip-scrub-lock
authorSamuel Just <sam.just@inktank.com>
Wed, 19 Mar 2014 17:46:32 +0000 (10:46 -0700)
committerSamuel Just <sam.just@inktank.com>
Wed, 19 Mar 2014 17:46:32 +0000 (10:46 -0700)
commit72093f97a9f443f6dfc8289e73e36e6686a6fa99
tree943d358fdfe05eb34280676a26ceccda0aaf0c4c
parent002c7e7544cbded3a8473a055fdc9a999f681855
parent173116faac50e7c5e596ddcf323b8edbe87bfaa2
Merge pull request #1476 from ceph/wip-scrub-lock

osd: do not queue scrub for non-primary

Reviewed-by: Samuel Just <sam.just@inktank.com>
src/osd/OSD.cc
src/osd/PG.cc