Merge branch 'unstable' of ssh://ceph.newdream.net/home/sage/ceph.newdream.net/git...

author Sage Weil <sage@newdream.net>

Sat, 10 Oct 2009 04:24:08 +0000 (21:24 -0700)

committer Sage Weil <sage@newdream.net>

Sat, 10 Oct 2009 04:24:08 +0000 (21:24 -0700)
author Sage Weil <sage@newdream.net>
Sat, 10 Oct 2009 04:24:08 +0000 (21:24 -0700)
committer Sage Weil <sage@newdream.net>
Sat, 10 Oct 2009 04:24:08 +0000 (21:24 -0700)
diff --cc src/mon/Monitor.cc
Simple merge
diff --cc src/mon/Monitor.h
Simple merge
diff --cc src/msg/Message.cc
Simple merge
diff --cc src/msg/Message.h
Simple merge
author	Sage Weil <sage@newdream.net>
	Sat, 10 Oct 2009 04:24:08 +0000 (21:24 -0700)
committer	Sage Weil <sage@newdream.net>
	Sat, 10 Oct 2009 04:24:08 +0000 (21:24 -0700)
		1	2
src/mon/Monitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/Monitor.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/msg/Message.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/msg/Message.h	patch \|	diff1 \|	diff2 \|	blob \| history