]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
Merge remote branch 'origin/syslog' into unstable
authorSage Weil <sage@newdream.net>
Sat, 11 Dec 2010 16:09:17 +0000 (08:09 -0800)
committerSage Weil <sage@newdream.net>
Sat, 11 Dec 2010 16:09:17 +0000 (08:09 -0800)
commit239b7677e7a9df86d35cbfb25226c3f1a06771c5
tree661a7e07bb20b5e5e2cfab53386bd08123485bac
parent46242586eddcc948f71260f8c1ea2e8b1845a9f8
parent027d5bfdca196954937c1b038354ca15b5c699b7
Merge remote branch 'origin/syslog' into unstable

Conflicts:
src/mon/Paxos.cc
src/osd/PG.cc
24 files changed:
src/Makefile.am
src/auth/Crypto.cc
src/client/Client.cc
src/common/DoutStreambuf.cc
src/config.cc
src/config.h
src/librados.cc
src/mds/CDir.cc
src/mds/CInode.cc
src/mds/Locker.cc
src/mds/MDCache.cc
src/mds/Migrator.cc
src/mds/Server.cc
src/mon/OSDMonitor.cc
src/mon/Paxos.cc
src/msg/SimpleMessenger.cc
src/os/FileJournal.cc
src/os/FileStore.cc
src/os/JournalingObjectStore.cc
src/osd/OSD.cc
src/osd/PG.cc
src/osd/ReplicatedPG.cc
src/tools/ceph.cc
src/tools/cmd.cc