]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
Merge branch 'wip-mon'
authorSage Weil <sage.weil@dreamhost.com>
Sat, 28 Apr 2012 21:48:51 +0000 (14:48 -0700)
committerSage Weil <sage.weil@dreamhost.com>
Sat, 28 Apr 2012 21:48:51 +0000 (14:48 -0700)
commitc97c20de0ecd435c769926d957ecd07391c20cc4
treeac234f1525f57988e513c98c4fe051bc7f6f450b
parentc661e66cc2b808aeb47672b129f51bbef9f76523
parente205e11c5acccdf87f85e6d12f25cb1e376ad056
Merge branch 'wip-mon'

Reviewed-by: Gregory Farnum <gregory.farnum@dreamhost.com>
src/common/config_opts.h
src/mon/Monitor.h
src/mon/OSDMonitor.cc
src/osd/OSD.cc
src/osd/OSDMap.cc
src/osd/OSDMap.h