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: a4cc231 35e6892)

author	Sage Weil <sage@newdream.net>
	Thu, 12 Nov 2009 23:23:24 +0000 (15:23 -0800)
committer	Sage Weil <sage@newdream.net>
	Thu, 12 Nov 2009 23:23:24 +0000 (15:23 -0800)
commit	b5a11130bec988f432626699eb327195dbe18ca5
tree	f4f8887777a29093afdba1ccfa63bea26fe7887a	tree \| snapshot
parent	a4cc2314587b6a4b2bbe9cd8a983444427e2dc0c	commit \| diff
parent	35e68924d13250bcfef0ec967e23b7bfd3134f68	commit \| diff

Merge branch 'unstable' into auth

src/Makefile.am	diff1 \|	diff2 \|	blob \| history
src/config.cc	diff1 \|	diff2 \|	blob \| history
src/config.h	diff1 \|	diff2 \|	blob \| history
src/mds/MDS.cc	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.cc	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.h	diff1 \|	diff2 \|	blob \| history
src/rados.cc	diff1 \|	diff2 \|	blob \| history

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