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: c02f33d 597c43e)

author	Sage Weil <sage@redhat.com>
	Sat, 24 Oct 2015 12:31:16 +0000 (08:31 -0400)
committer	Sage Weil <sage@redhat.com>
	Sat, 24 Oct 2015 12:31:16 +0000 (08:31 -0400)
commit	aed2e87e80b485dc5e6b087404eef9aa722151ec
tree	09ff153c83ac9ae85dac9ab40bd1b1fb83e32e81	tree \| snapshot
parent	c02f33dbaa98e2e5561635c32567e06e0bbca70e	commit \| diff
parent	597c43ea393bc4433b1c4b999024b8f84e3bac6f	commit \| diff

Merge pull request #6326 from liewegas/wip-cache-pin-unpin

osd: add pin/unpin support to cache tier

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

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

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