]> 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: a7fd8a1 1d5d970)
Merge commit 'origin/unstable' into snap
authorSage Weil <sage@newdream.net>
Fri, 15 Aug 2008 00:36:46 +0000 (17:36 -0700)
committerSage Weil <sage@newdream.net>
Fri, 15 Aug 2008 00:36:46 +0000 (17:36 -0700)
commitc09b277e1e524691893b15e72d780a2f946d4a86
tree47a0f68ad7c01296114c257747cacf112296758btree | snapshot
parenta7fd8a1931bc83ff06206c25c8e643ac5c357122commit | diff
parent1d5d9705406ec6af354173bed33ca9eb7a241de8commit | diff
Merge commit 'origin/unstable' into snap

Conflicts:

src/client/SyntheticClient.cc
src/osd/ReplicatedPG.cc
src/vstartnew.sh
13 files changed:
src/client/SyntheticClient.cc diff1 | diff2 | blob | history
src/client/SyntheticClient.h diff1 | diff2 | blob | history
src/config.cc diff1 | diff2 | blob | history
src/mon/OSDMonitor.cc diff1 | diff2 | blob | history
src/osd/OSD.cc diff1 | diff2 | blob | history
src/osd/PG.cc diff1 | diff2 | blob | history
src/osd/PG.h 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
src/osdc/Objecter.cc diff1 | diff2 | blob | history
src/osdc/Objecter.h diff1 | diff2 | blob | history
src/vstartnew.sh diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.