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: deec333 78b005b)

author	Sage Weil <sage@newdream.net>
	Wed, 9 Sep 2009 20:42:51 +0000 (13:42 -0700)
committer	Sage Weil <sage@newdream.net>
	Wed, 9 Sep 2009 20:42:51 +0000 (13:42 -0700)
commit	736c415f1d5356f35c2e75db6ae38b259d775ba9
tree	e4537526a82e1669cf89da31c7e991a4a6d5c1c5	tree \| snapshot
parent	deec333f99651751d6770739515dfbe4374f8a35	commit \| diff
parent	78b005b3172dd04d653b10cf15ad35d3956dafcb	commit \| diff

Merge branch 'unstable' into auth

Conflicts:

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

15 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/config.h	diff1 \|	diff2 \|	blob \| history
src/include/ceph_fs.h	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/ClientMap.h	diff1 \|	diff2 \|	blob \| history
src/mon/ClientMonitor.cc	diff1 \|	diff2 \|	blob \| history
src/mon/ClientMonitor.h	diff1 \|	diff2 \|	blob \| history
src/mon/MonClient.cc	diff1 \|	diff2 \|	blob \| history
src/mon/MonClient.h	diff1 \|	diff2 \|	blob \| history
src/mon/PaxosService.cc	diff1 \|	diff2 \|	blob \| history

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