]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
Merge branch 'unstable' into auth
authorSage Weil <sage@newdream.net>
Wed, 21 Oct 2009 23:13:48 +0000 (16:13 -0700)
committerSage Weil <sage@newdream.net>
Wed, 21 Oct 2009 23:13:48 +0000 (16:13 -0700)
commit805b6cbed070cbd870e2ac52c1494834ece81e2f
tree8e21fa8c12f0a7d2817e6dd8a767163b3e744f1a
parentcaeef31c565ef3295ef512dba2f9d5c95f935130
parent0b26194fd2f876b2b1301eefb9eb3ebbb70c1b21
Merge branch 'unstable' into auth

Conflicts:
src/Makefile.am
src/ceph.cc
src/include/ceph_fs.h
src/kernel/super.c
src/kernel/super.h
src/librados.cc
src/mon/MonClient.cc
src/mon/MonClient.h
src/mon/Monitor.cc
src/mon/Monitor.h
src/mon/mon_types.h
src/msg/Dispatcher.h
src/msg/Message.h
src/msg/SimpleMessenger.cc
src/msg/SimpleMessenger.h
src/osd/OSD.h
40 files changed:
src/Makefile.am
src/auth/AuthorizeServer.h
src/ceph.cc
src/cfuse.cc
src/client/Client.cc
src/cmds.cc
src/cmon.cc
src/common/ConfUtils.cc
src/config.cc
src/config.h
src/cosd.cc
src/csyn.cc
src/dumpjournal.cc
src/include/ceph_fs.h
src/include/msgr.h
src/libceph.cc
src/librados.cc
src/mds/MDS.cc
src/mds/MDS.h
src/mon/ClassMonitor.cc
src/mon/ClientMonitor.cc
src/mon/MonClient.cc
src/mon/MonClient.h
src/mon/Monitor.cc
src/mon/Monitor.h
src/mon/PaxosService.cc
src/mon/PaxosService.h
src/mon/Session.h
src/mon/mon_types.h
src/msg/Dispatcher.h
src/msg/Message.cc
src/msg/Message.h
src/msg/Messenger.h
src/msg/SimpleMessenger.cc
src/msg/SimpleMessenger.h
src/osd/OSD.cc
src/osd/OSD.h
src/osdc/Objecter.h
src/testmsgr.cc
src/vstart.sh