]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8eaef41 91b8c78)
Merge pull request #1079 from ceph/wip-tier-bits
authorGregory Farnum <greg@inktank.com>
Wed, 22 Jan 2014 21:44:46 +0000 (13:44 -0800)
committerGregory Farnum <greg@inktank.com>
Wed, 22 Jan 2014 21:44:46 +0000 (13:44 -0800)
osd: a few tiering fixes

Reviewed-by: Greg Farnum <greg@inktank.com>
1  2 
src/mon/OSDMonitor.cc patch | diff1 | diff2 | blob | history
src/osd/ReplicatedPG.cc patch | diff1 | diff2 | blob | history

diff --cc src/mon/OSDMonitor.cc
Simple merge
diff --cc src/osd/ReplicatedPG.cc
Simple merge
Unnamed repository; edit this file 'description' to name the repository.