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: ed2c3db 988e350)

author	Sage Weil <sage@newdream.net>
	Wed, 3 Dec 2008 23:06:25 +0000 (15:06 -0800)
committer	Sage Weil <sage@newdream.net>
	Wed, 3 Dec 2008 23:06:25 +0000 (15:06 -0800)
commit	ad89055d1686448944d029cb400dbe5f226cd8ea
tree	8c433babfb596d1553dd96a5a1249b6938c3e7ba	tree \| snapshot
parent	ed2c3db42a2007558d1f75f8dcd61b20329eead4	commit \| diff
parent	988e350d35bba9591cd0ca5b58ce9ecb8f8ddd80	commit \| diff

Merge branch 'diskformat' into unstable

src/Makefile.am	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
src/osd/ReplicatedPG.h	diff1 \|	diff2 \|	blob \| history

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