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: 0f2ea11 4fbaef9)

author	Sage Weil <sage@newdream.net>
	Tue, 1 Apr 2008 21:39:43 +0000 (14:39 -0700)
committer	Sage Weil <sage@newdream.net>
	Tue, 1 Apr 2008 21:39:43 +0000 (14:39 -0700)
commit	03733a7bf8c304a386b21c0bc5dd9f9c76db218e
tree	6311841ed36d0d926dfd590c7011a165fe012aab	tree \| snapshot
parent	0f2ea1150758443ad453077959f2bc6cda213dc9	commit \| diff
parent	4fbaef963df983d4f20d05bb4161f66a30818f3d	commit \| diff

Merge commit 'origin/msgr' into unstable

Conflicts:

src/start.sh

src/include/ceph_fs.h	diff1 \|	diff2 \|	blob \| history
src/kernel/client.c	diff1 \|	diff2 \|	blob \| history
src/kernel/messenger.c	diff1 \|	diff2 \|	blob \| history
src/kernel/messenger.h	diff1 \|	diff2 \|	blob \| history
src/msg/SimpleMessenger.cc	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.h	diff1 \|	diff2 \|	blob \| history

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