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: 62532fb bd8fcd2)

author	Sage Weil <sage@inktank.com>
	Mon, 17 Feb 2014 22:14:21 +0000 (14:14 -0800)
committer	Sage Weil <sage@inktank.com>
	Mon, 17 Feb 2014 22:14:21 +0000 (14:14 -0800)
commit	093128a8b13869064b24633f9c3e45f1c55d608a
tree	f2071b2ef63cde432ef4e7c32ad3a8ecb6ac7fb6	tree \| snapshot
parent	62532fb0251d5b2d60024b472bd39647c862529d	commit \| diff
parent	bd8fcd2543fb0804b8d5688eccaaf6fda5a9b28c	commit \| diff

Merge pull request #1139 from ceph/wip-agent

osd: basic cache tier agent

Reviewed-by: Samuel Just <sam.just@inktank.com>

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

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