Merge pull request #22056 from jiangxiyxy/Branch_master

author Kefu Chai <tchaikov@gmail.com>

Fri, 1 Jun 2018 00:06:40 +0000 (08:06 +0800)

committer GitHub <noreply@github.com>

Fri, 1 Jun 2018 00:06:40 +0000 (08:06 +0800)
author Kefu Chai <tchaikov@gmail.com>
Fri, 1 Jun 2018 00:06:40 +0000 (08:06 +0800)
committer GitHub <noreply@github.com>
Fri, 1 Jun 2018 00:06:40 +0000 (08:06 +0800)
diff --cc src/kv/KeyValueDB.h
Simple merge
diff --cc src/mon/Monitor.cc
Simple merge
diff --cc src/mon/MonitorDBStore.h
Simple merge
author	Kefu Chai <tchaikov@gmail.com>
	Fri, 1 Jun 2018 00:06:40 +0000 (08:06 +0800)
committer	GitHub <noreply@github.com>
	Fri, 1 Jun 2018 00:06:40 +0000 (08:06 +0800)
		1	2
src/kv/KeyValueDB.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/Monitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/MonitorDBStore.h	patch \|	diff1 \|	diff2 \|	blob \| history