]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
Merge remote branch 'origin/wip_coverage'
authorJosh Durgin <josh.durgin@dreamhost.com>
Fri, 10 Jun 2011 18:28:09 +0000 (11:28 -0700)
committerJosh Durgin <josh.durgin@dreamhost.com>
Fri, 10 Jun 2011 18:28:09 +0000 (11:28 -0700)
commit08d0d0ae21805f22e2b5cccb39784d94830c114c
treed7535e5a4f1bba5db551a3807d688e7a9f8000ce
parenta6afb0519b2b4e79370fff0991a110f8ef930129
parent2b5e01117e4de66b0b4b646904295e239346a9df
Merge remote branch 'origin/wip_coverage'

Conflicts:
src/mon/Monitor.cc

Signed-off-by: Josh Durgin <josh.durgin@dreamhost.com>
src/mds/MDS.cc
src/mon/Monitor.cc
src/mon/Monitor.h
src/osd/OSD.cc