Merge pull request #2440 from somnathr/wip-optracker-optimization

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

Thu, 18 Sep 2014 16:26:40 +0000 (09:26 -0700)

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

Thu, 18 Sep 2014 16:26:40 +0000 (09:26 -0700)
author Samuel Just <sam.just@inktank.com>
Thu, 18 Sep 2014 16:26:40 +0000 (09:26 -0700)
committer Samuel Just <sam.just@inktank.com>
Thu, 18 Sep 2014 16:26:40 +0000 (09:26 -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>
	Thu, 18 Sep 2014 16:26:40 +0000 (09:26 -0700)
committer	Samuel Just <sam.just@inktank.com>
	Thu, 18 Sep 2014 16:26:40 +0000 (09:26 -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