git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit

]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit

projects / ceph.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: e6f8229 6d66b43)

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)
commit	0c8bc1e1a1c3aeb92ab0ad0eee047b8aa2387db8
tree	f570d604fa271c8f2b0ff302d820492d60353560	tree \| snapshot
parent	e6f82293075c0eedeb9feaaa914f3096d1e9d3d0	commit \| diff
parent	6d66b439c672b6240a0580420e714403d3fae37f	commit \| diff

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

src/mon/Monitor.cc	diff1 \|	diff2 \|	blob \| history
src/mon/Monitor.h	diff1 \|	diff2 \|	blob \| history
src/msg/Message.cc	diff1 \|	diff2 \|	blob \| history
src/msg/Message.h	diff1 \|	diff2 \|	blob \| history

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