Merge pull request #21112 from guzhongyan/fix-vlog

author Kefu Chai <tchaikov@gmail.com>

Tue, 10 Apr 2018 10:51:12 +0000 (18:51 +0800)

committer GitHub <noreply@github.com>

Tue, 10 Apr 2018 10:51:12 +0000 (18:51 +0800)
author Kefu Chai <tchaikov@gmail.com>
Tue, 10 Apr 2018 10:51:12 +0000 (18:51 +0800)
committer GitHub <noreply@github.com>
Tue, 10 Apr 2018 10:51:12 +0000 (18:51 +0800)
diff --cc src/client/Client.cc
Simple merge
diff --cc src/mds/MDCache.cc
Simple merge
diff --cc src/osd/PrimaryLogPG.cc
Simple merge
author	Kefu Chai <tchaikov@gmail.com>
	Tue, 10 Apr 2018 10:51:12 +0000 (18:51 +0800)
committer	GitHub <noreply@github.com>
	Tue, 10 Apr 2018 10:51:12 +0000 (18:51 +0800)
		1	2
src/client/Client.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/mds/MDCache.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/PrimaryLogPG.cc	patch \|	diff1 \|	diff2 \|	blob \| history