]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
Merge remote branch 'origin/unstable' into standby_replay
authorGreg Farnum <gregf@hq.newdream.net>
Thu, 6 Jan 2011 22:50:35 +0000 (14:50 -0800)
committerGreg Farnum <gregf@hq.newdream.net>
Thu, 6 Jan 2011 22:50:35 +0000 (14:50 -0800)
commitb1b4c03e4caec3c61abedc467a8199b717e27c87
tree67ecf6e10763d5b0f3868fc2e69d5a6a77e2b9ce
parentb0676cb949618a73ff4b82afcf33eca5e2e6cd2c
parent8dbe529e684e8ee86069cc60f2ca5a9cf8848409
Merge remote branch 'origin/unstable' into standby_replay

Conflicts:
src/cmds.cc
src/mds/MDS.cc
src/mds/MDS.h
12 files changed:
src/cmds.cc
src/config.cc
src/config.h
src/include/ceph_fs.h
src/include/ceph_strings.cc
src/mds/MDCache.cc
src/mds/MDLog.cc
src/mds/MDS.cc
src/mds/MDS.h
src/mds/journal.cc
src/mon/MDSMonitor.cc
src/osdc/Journaler.cc