]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
projects / ceph.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: b7f578c b434bb1)
Merge remote branch 'origin/object_locator' into unstable
authorSage Weil <sage@newdream.net>
Sun, 7 Nov 2010 17:56:42 +0000 (09:56 -0800)
committerSage Weil <sage@newdream.net>
Sun, 7 Nov 2010 17:56:42 +0000 (09:56 -0800)
commit0feec2f4f31aa3a259b2cdf885d6458995ce860b
treeaac0e6b4a4eb2e2ad9a33ca7bf20eb77f84d7ce6tree | snapshot
parentb7f578cf76dcda18209c986a484c9cedc81edfcfcommit | diff
parentb434bb1af85e41acea1b677c8233b0125ba03500commit | diff
Merge remote branch 'origin/object_locator' into unstable

Conflicts:
src/osd/OSD.cc
src/osd/ReplicatedPG.cc
src/osd/ReplicatedPG.h
src/osd/osd_types.h
src/include/object.h diff1 | diff2 | blob | history
src/osd/OSD.cc diff1 | diff2 | blob | history
src/osd/PG.cc diff1 | diff2 | blob | history
src/osd/ReplicatedPG.cc diff1 | diff2 | blob | history
src/osd/ReplicatedPG.h diff1 | diff2 | blob | history
src/osd/osd_types.h diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.