Merge pull request #5168 from majianpeng/dynamic-control-optracker

author Sage Weil <sage@redhat.com>

Wed, 11 Nov 2015 14:02:26 +0000 (09:02 -0500)

committer Sage Weil <sage@redhat.com>

Wed, 11 Nov 2015 14:02:26 +0000 (09:02 -0500)
author Sage Weil <sage@redhat.com>
Wed, 11 Nov 2015 14:02:26 +0000 (09:02 -0500)
committer Sage Weil <sage@redhat.com>
Wed, 11 Nov 2015 14:02:26 +0000 (09:02 -0500)
diff --cc src/common/TrackedOp.cc
Simple merge
diff --cc src/mds/MDSDaemon.cc
Simple merge
diff --cc src/mds/MDSRank.cc
Simple merge
diff --cc src/osd/OSD.cc
Simple merge
author	Sage Weil <sage@redhat.com>
	Wed, 11 Nov 2015 14:02:26 +0000 (09:02 -0500)
committer	Sage Weil <sage@redhat.com>
	Wed, 11 Nov 2015 14:02:26 +0000 (09:02 -0500)
		1	2
src/common/TrackedOp.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/mds/MDSDaemon.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/mds/MDSRank.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.cc	patch \|	diff1 \|	diff2 \|	blob \| history