git.apps.os.sepia.ceph.com Git - ceph.git/commit

]> git.apps.os.sepia.ceph.com Git - ceph.git/commit

projects / ceph.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: b59cb10 b219435)

author	Sage Weil <sage@newdream.net>
	Fri, 23 Jul 2010 22:53:47 +0000 (15:53 -0700)
committer	Sage Weil <sage@newdream.net>
	Fri, 23 Jul 2010 22:53:47 +0000 (15:53 -0700)
commit	8f9f57a297131ea2d9a5f2f7548c73b67c7ded8b
tree	6841a2947872cdc91279020a87ce301e0765c3bb	tree \| snapshot
parent	b59cb10dc89abc4c065c48044f602de2b90bf2f7	commit \| diff
parent	b2194357d81e5f267f70e809ac131235a6cb6cfb	commit \| diff

Merge branch 'unstable' into large_objects

src/config.cc	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.cc	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.h	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

Unnamed repository; edit this file 'description' to name the repository.