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: 6cb448d 09839d0)

author	Kefu Chai <tchaikov@gmail.com>
	Tue, 8 Sep 2015 09:29:29 +0000 (17:29 +0800)
committer	Kefu Chai <tchaikov@gmail.com>
	Tue, 8 Sep 2015 09:29:29 +0000 (17:29 +0800)
commit	ef9283ae90f12fc9b16edbbbfe8e2d1d2c8dd52b
tree	118b38366a6976b6868c96a2345ca75157fec35e	tree \| snapshot
parent	6cb448daf06bf9b71af8113438163c4b44188ca9	commit \| diff
parent	09839d00c0e1c5bc0e9ee2e1a1d24cb2cf9a1118	commit \| diff

Merge pull request #5463 from kylinstorage/wip-evict_ops

Allow evict operations to be throttled

Reviewed-by: Sage Weil <sage@redhat.com>

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

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