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: b36dbd6 b051a2f)

author	Sage Weil <sage@newdream.net>
	Tue, 10 Nov 2009 05:12:16 +0000 (21:12 -0800)
committer	Sage Weil <sage@newdream.net>
	Tue, 10 Nov 2009 05:12:16 +0000 (21:12 -0800)
commit	6f62583cded2dd3fe9da633e1087ea1bab98d67d
tree	27a7c63decd925532620d89e8606f6034e816703	tree \| snapshot
parent	b36dbd66d5308ddfd3b0e01e8e3190daa7e8f560	commit \| diff
parent	b051a2fd4a8f3959b86a836b50b7d46aedd057c9	commit \| diff

Merge branch 'unstable' into auth

Conflicts:
src/Makefile.am
src/mkmonfs.cc
src/msg/SimpleMessenger.cc

18 files changed:

src/Makefile.am	diff1 \|	diff2 \|	blob \| history
src/client/Client.cc	diff1 \|	diff2 \|	blob \| history
src/config.cc	diff1 \|	diff2 \|	blob \| history
src/crush/grammar.h	diff1 \|	diff2 \|	blob \| history
src/include/buffer.h	diff1 \|	diff2 \|	blob \| history
src/include/ceph_fs.h	diff1 \|	diff2 \|	blob \| history
src/include/msgr.h	diff1 \|	diff2 \|	blob \| history
src/include/rados.h	diff1 \|	diff2 \|	blob \| history
src/mkmonfs.cc	diff1 \|	diff2 \|	blob \| history
src/mon/Monitor.cc	diff1 \|	diff2 \|	blob \| history
src/mon/mon_types.h	diff1 \|	diff2 \|	blob \| history
src/msg/SimpleMessenger.cc	diff1 \|	diff2 \|	blob \| history
src/msg/msg_types.h	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.cc	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.h	diff1 \|	diff2 \|	blob \| history
src/osd/osd_types.h	diff1 \|	diff2 \|	blob \| history
src/osdmaptool.cc	diff1 \|	diff2 \|	blob \| history
src/streamtest.cc	diff1 \|	diff2 \|	blob \| history

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