Merge pull request #4386 from ceph/wip-10657

author Gregory Farnum <greg@gregs42.com>

Tue, 21 Apr 2015 21:19:21 +0000 (14:19 -0700)

committer Gregory Farnum <greg@gregs42.com>

Tue, 21 Apr 2015 21:19:21 +0000 (14:19 -0700)
author Gregory Farnum <greg@gregs42.com>
Tue, 21 Apr 2015 21:19:21 +0000 (14:19 -0700)
committer Gregory Farnum <greg@gregs42.com>
Tue, 21 Apr 2015 21:19:21 +0000 (14:19 -0700)
diff --cc src/client/Client.cc
Simple merge
diff --cc src/common/config_opts.h
Simple merge
diff --cc src/mds/Server.cc
Simple merge
author	Gregory Farnum <greg@gregs42.com>
	Tue, 21 Apr 2015 21:19:21 +0000 (14:19 -0700)
committer	Gregory Farnum <greg@gregs42.com>
	Tue, 21 Apr 2015 21:19:21 +0000 (14:19 -0700)
		1	2
src/client/Client.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/common/config_opts.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/mds/Server.cc	patch \|	diff1 \|	diff2 \|	blob \| history