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: 3428526 b821a4b)

author	Sage Weil <sage@newdream.net>
	Tue, 12 May 2009 15:07:51 +0000 (08:07 -0700)
committer	Sage Weil <sage@newdream.net>
	Tue, 12 May 2009 15:07:51 +0000 (08:07 -0700)
commit	d4c13c1e5a128b10a5687a721bc5ed725c825ad4
tree	8acc66f38ca593be0809c66574097347d0433924	tree \| snapshot
parent	342852639adc84a10769deeaa140cbd02d68114b	commit \| diff
parent	b821a4bc1100aee884185d94c9df09cfb961dc6b	commit \| diff

Merge branch 'c3' into rados

src/ceph.cc	diff1 \|	diff2 \|	blob \| history
src/mon/OSDMonitor.cc	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.cc	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.h	diff1 \|	diff2 \|	blob \| history
src/osd/ReplicatedPG.cc	diff1 \|	diff2 \|	blob \| history

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