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: 4963bbd 0f22324)

author	Yehuda Sadeh <yehuda@hq.newdream.net>
	Mon, 21 Sep 2009 23:35:01 +0000 (16:35 -0700)
committer	Yehuda Sadeh <yehuda@hq.newdream.net>
	Mon, 21 Sep 2009 23:35:01 +0000 (16:35 -0700)
commit	fea2be81db223ab013a64de89c7395069c098768
tree	59a094e632e7ff5f2b8a76a297b3dcc5d6c8213c	tree \| snapshot
parent	4963bbda200caae183404331e88b673867f386ff	commit \| diff
parent	0f22324d860c3fbeaebeb9012c7b940804eb86b7	commit \| diff

Merge commit 'origin/unstable' into auth

Conflicts:

src/mon/MonClient.cc
src/mon/MonClient.h

14 files changed:

src/Makefile.am	diff1 \|	diff2 \|	blob \| history
src/ceph.cc	diff1 \|	diff2 \|	blob \| history
src/client/Client.cc	diff1 \|	diff2 \|	blob \| history
src/kernel/Makefile	diff1 \|	diff2 \|	blob \| history
src/kernel/super.c	diff1 \|	diff2 \|	blob \| history
src/kernel/super.h	diff1 \|	diff2 \|	blob \| history
src/librados.cc	diff1 \|	diff2 \|	blob \| history
src/mon/ClientMonitor.cc	diff1 \|	diff2 \|	blob \| history
src/mon/MonClient.cc	diff1 \|	diff2 \|	blob \| history
src/mon/MonClient.h	diff1 \|	diff2 \|	blob \| history
src/mon/Monitor.cc	diff1 \|	diff2 \|	blob \| history
src/mon/Monitor.h	diff1 \|	diff2 \|	blob \| history
src/msg/Message.h	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.cc	diff1 \|	diff2 \|	blob \| history

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