]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Merge branch 'unstable' into mon-remove
authorSage Weil <sage@newdream.net>
Thu, 29 Jul 2010 20:24:08 +0000 (13:24 -0700)
committerSage Weil <sage@newdream.net>
Thu, 29 Jul 2010 20:24:08 +0000 (13:24 -0700)
commit9052986fd3fb5fc065fd9781bbfdb131194e845a
tree24f75eacf1692af93fe29784ca733cd7f091be9e
parent2c2502995b77695d169130ad31c006356a549771
parent11dc1af176c852cd964b77cf909e2fa313c785af
Merge branch 'unstable' into mon-remove

Conflicts:
src/cmon.cc
src/include/ceph_fs.h
src/mon/MonClient.cc
src/mon/Monitor.cc
21 files changed:
src/cmon.cc
src/include/ceph_fs.h
src/messages/MForward.h
src/mkcephfs.in
src/mon/AuthMonitor.cc
src/mon/ClassMonitor.cc
src/mon/Elector.h
src/mon/LogMonitor.cc
src/mon/MDSMonitor.cc
src/mon/MonClient.cc
src/mon/MonClient.h
src/mon/MonMap.h
src/mon/Monitor.cc
src/mon/Monitor.h
src/mon/OSDMonitor.cc
src/mon/PGMonitor.cc
src/mon/Paxos.cc
src/mon/Paxos.h
src/mon/Session.h
src/testmsgr.cc
src/vstart.sh