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: 82728db 2474783)

author	Sage Weil <sage@newdream.net>
	Tue, 2 Feb 2010 19:05:46 +0000 (11:05 -0800)
committer	Sage Weil <sage@newdream.net>
	Tue, 2 Feb 2010 19:05:46 +0000 (11:05 -0800)
commit	c60edb4a3f9bf58826f3db0cc746fb48cc848fc5
tree	8f063c075568309eeb32003b7a11f430f5ff2ff6	tree \| snapshot
parent	82728dbee3181eb29a749f7a197a5d49433af598	commit \| diff
parent	24747836fea4f717ac07a891362962842c1e479d	commit \| diff

Merge branch 'unstable' into filestore

Conflicts:

src/os/FileJournal.cc

src/config.cc	diff1 \|	diff2 \|	blob \| history
src/config.h	diff1 \|	diff2 \|	blob \| history
src/os/FileJournal.cc	diff1 \|	diff2 \|	blob \| history
src/os/FileJournal.h	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.cc	diff1 \|	diff2 \|	blob \| history
src/osd/ReplicatedPG.cc	diff1 \|	diff2 \|	blob \| history

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