git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit

]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit

projects / ceph.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 58909e7 762f3da)

author	Sage Weil <sage@newdream.net>
	Thu, 5 Oct 2017 19:37:52 +0000 (14:37 -0500)
committer	GitHub <noreply@github.com>
	Thu, 5 Oct 2017 19:37:52 +0000 (14:37 -0500)
commit	882e6902f388dcf12c7e601aca1b0733a061a4c6
tree	0bff529512cd73f9b148c8c30837620e57873d5b	tree \| snapshot
parent	58909e799bf1b0596f138a3b8ff7c73d954739b2	commit \| diff
parent	762f3dacea9f029b6e33d480b25f73bc25f80923	commit \| diff

Merge pull request #18070 from liewegas/wip-21613

osd: fix replica/backfill target handling of REJECT

Reviewed-by: Greg Farnum <gfarnum@redhat.com>

src/osd/OSD.cc	diff1 \|	diff2 \|	blob \| history
src/osd/PG.cc	diff1 \|	diff2 \|	blob \| history
src/osd/PG.h	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.