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: dbf03b6 f673908)

author	Sage Weil <sage@newdream.net>
	Fri, 8 May 2009 21:05:31 +0000 (14:05 -0700)
committer	Sage Weil <sage@newdream.net>
	Fri, 8 May 2009 21:05:31 +0000 (14:05 -0700)
commit	35c871fc4622f0d140d57cbf8b0cfd61a3fd3f7e
tree	218ad0ff651e984ac1a6b5ea4aab1e05b6a1da53	tree \| snapshot
parent	dbf03b6618b1ac6464f42a33836fcd3dffbe5535	commit \| diff
parent	f67390848eb2476b8812c4aaa6c996ccf6df34b7	commit \| diff

Merge branch 'unstable' into rados

src/TODO	diff1 \|	diff2 \|	blob \| history
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/osd_types.h	diff1 \|	diff2 \|	blob \| history

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