Merge remote-tracking branch 'gh/cuttlefish' into wip-mon-sync-2

author Sage Weil <sage@inktank.com>

Wed, 10 Jul 2013 18:40:37 +0000 (11:40 -0700)

committer Sage Weil <sage@inktank.com>

Wed, 10 Jul 2013 18:40:37 +0000 (11:40 -0700)
author Sage Weil <sage@inktank.com>
Wed, 10 Jul 2013 18:40:37 +0000 (11:40 -0700)
committer Sage Weil <sage@inktank.com>
Wed, 10 Jul 2013 18:40:37 +0000 (11:40 -0700)
diff --cc src/common/config_opts.h
Simple merge
diff --cc src/mon/Monitor.cc
Simple merge
diff --cc src/mon/Monitor.h
Simple merge
diff --cc src/mon/MonitorDBStore.h
Simple merge
author	Sage Weil <sage@inktank.com>
	Wed, 10 Jul 2013 18:40:37 +0000 (11:40 -0700)
committer	Sage Weil <sage@inktank.com>
	Wed, 10 Jul 2013 18:40:37 +0000 (11:40 -0700)
		1	2
src/common/config_opts.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/Monitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/Monitor.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/MonitorDBStore.h	patch \|	diff1 \|	diff2 \|	blob \| history