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: 053db04 d00b917)

author	Sage Weil <sage@newdream.net>
	Thu, 19 Nov 2009 00:01:20 +0000 (16:01 -0800)
committer	Sage Weil <sage@newdream.net>
	Thu, 19 Nov 2009 00:01:20 +0000 (16:01 -0800)
commit	2e2eaa6b1f0e9ba93d1f7435f6effd93d8eb7439
tree	acc2ccf13c41952013631cb06b5d8751d7231ac9	tree \| snapshot
parent	053db04667b46e67956fe7a93569d2953042db33	commit \| diff
parent	d00b917143e2afd72851bfd0400b2c2a1f3fc018	commit \| diff

Merge commit 'd00b917143e2afd72851bfd0400b2c2a1f3fc018' into auth

src/client/Client.cc	diff1 \|	diff2 \|	blob \| history
src/client/Client.h	diff1 \|	diff2 \|	blob \| history
src/config.cc	diff1 \|	diff2 \|	blob \| history
src/cosd.cc	diff1 \|	diff2 \|	blob \| history
src/mds/MDS.cc	diff1 \|	diff2 \|	blob \| history
src/mon/MonClient.cc	diff1 \|	diff2 \|	blob \| history
src/msg/SimpleMessenger.cc	diff1 \|	diff2 \|	blob \| history
src/msg/SimpleMessenger.h	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.