]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #1139 from ceph/wip-agent
authorSage Weil <sage@inktank.com>
Mon, 17 Feb 2014 22:14:21 +0000 (14:14 -0800)
committerSage Weil <sage@inktank.com>
Mon, 17 Feb 2014 22:14:21 +0000 (14:14 -0800)
osd: basic cache tier agent

Reviewed-by: Samuel Just <sam.just@inktank.com>
1  2 
src/mon/MonCommands.h
src/osd/OSD.cc
src/osd/OSD.h
src/osd/ReplicatedPG.cc

Simple merge
diff --cc src/osd/OSD.cc
Simple merge
diff --cc src/osd/OSD.h
Simple merge
Simple merge