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

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

projects / ceph.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: ad1cd81 618f7f2)

author	Sage Weil <sage@newdream.net>
	Thu, 22 Jul 2010 21:17:56 +0000 (14:17 -0700)
committer	Sage Weil <sage@newdream.net>
	Thu, 22 Jul 2010 21:17:56 +0000 (14:17 -0700)
commit	d9a7acbfe36a7eb231a080ffef01b885024e3093
tree	ad8f3353524e03a8ea2e8a9e96c27146d1189385	tree \| snapshot
parent	ad1cd81fd00067a2da88daf053b82683a2e64a0b	commit \| diff
parent	618f7f25dbda3ee20ae219ee85357000d06e0315	commit \| diff

Merge remote branch 'origin/large_objects' into unstable

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

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