Merge pull request #1223 from ceph/wip-7395

author Sage Weil <sage@inktank.com>

Sun, 16 Feb 2014 06:36:23 +0000 (22:36 -0800)

committer Sage Weil <sage@inktank.com>

Sun, 16 Feb 2014 06:36:23 +0000 (22:36 -0800)
author Sage Weil <sage@inktank.com>
Sun, 16 Feb 2014 06:36:23 +0000 (22:36 -0800)
committer Sage Weil <sage@inktank.com>
Sun, 16 Feb 2014 06:36:23 +0000 (22:36 -0800)
diff --cc src/mon/MonClient.h
Simple merge
diff --cc src/osd/OSD.cc
Simple merge
author	Sage Weil <sage@inktank.com>
	Sun, 16 Feb 2014 06:36:23 +0000 (22:36 -0800)
committer	Sage Weil <sage@inktank.com>
	Sun, 16 Feb 2014 06:36:23 +0000 (22:36 -0800)
		1	2
src/mon/MonClient.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.cc	patch \|	diff1 \|	diff2 \|	blob \| history