Merge pull request #1071 from ceph/wip-max-file-size

author Sage Weil <sage@inktank.com>

Tue, 14 Jan 2014 01:43:49 +0000 (17:43 -0800)

committer Sage Weil <sage@inktank.com>

Tue, 14 Jan 2014 01:43:49 +0000 (17:43 -0800)
author Sage Weil <sage@inktank.com>
Tue, 14 Jan 2014 01:43:49 +0000 (17:43 -0800)
committer Sage Weil <sage@inktank.com>
Tue, 14 Jan 2014 01:43:49 +0000 (17:43 -0800)
diff --cc src/mds/MDSMap.cc
Simple merge
diff --cc src/mon/MDSMonitor.cc
Simple merge
author	Sage Weil <sage@inktank.com>
	Tue, 14 Jan 2014 01:43:49 +0000 (17:43 -0800)
committer	Sage Weil <sage@inktank.com>
	Tue, 14 Jan 2014 01:43:49 +0000 (17:43 -0800)
		1	2
src/mds/MDSMap.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/MDSMonitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history