]> 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: 7c9638f 5ff30d6)
Merge pull request #988 from ceph/wip-crush-location
authorLoic Dachary <loic@dachary.org>
Wed, 25 Dec 2013 09:07:04 +0000 (01:07 -0800)
committerLoic Dachary <loic@dachary.org>
Wed, 25 Dec 2013 09:07:04 +0000 (01:07 -0800)
add 'crush location' config option

make check is ok

Reviewed-by: Loic Dachary <loic@dachary.org>
1  2 
src/osdc/Objecter.h patch | diff1 | diff2 | blob | history
src/test/osd/RadosModel.h patch | diff1 | diff2 | blob | history

diff --cc src/osdc/Objecter.h
Simple merge
diff --cc src/test/osd/RadosModel.h
Simple merge
Unnamed repository; edit this file 'description' to name the repository.