Merge remote-tracking branch 'somnathr/wip-optracker-optimization' into giant

author Samuel Just <sam.just@inktank.com>

Fri, 19 Sep 2014 20:34:44 +0000 (13:34 -0700)

committer Samuel Just <sam.just@inktank.com>

Fri, 19 Sep 2014 20:34:44 +0000 (13:34 -0700)
author Samuel Just <sam.just@inktank.com>
Fri, 19 Sep 2014 20:34:44 +0000 (13:34 -0700)
committer Samuel Just <sam.just@inktank.com>
Fri, 19 Sep 2014 20:34:44 +0000 (13:34 -0700)
diff --cc src/common/config_opts.h
Simple merge
diff --cc src/mds/MDS.cc
Simple merge
diff --cc src/osd/OSD.cc
Simple merge
author	Samuel Just <sam.just@inktank.com>
	Fri, 19 Sep 2014 20:34:44 +0000 (13:34 -0700)
committer	Samuel Just <sam.just@inktank.com>
	Fri, 19 Sep 2014 20:34:44 +0000 (13:34 -0700)
		1	2
src/common/config_opts.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/mds/MDS.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.cc	patch \|	diff1 \|	diff2 \|	blob \| history