Merge pull request #17430 from Songweibin/wip-osd-misc

author Kefu Chai <tchaikov@gmail.com>

Tue, 5 Sep 2017 05:43:05 +0000 (13:43 +0800)

committer GitHub <noreply@github.com>

Tue, 5 Sep 2017 05:43:05 +0000 (13:43 +0800)
author Kefu Chai <tchaikov@gmail.com>
Tue, 5 Sep 2017 05:43:05 +0000 (13:43 +0800)
committer GitHub <noreply@github.com>
Tue, 5 Sep 2017 05:43:05 +0000 (13:43 +0800)
diff --cc src/osd/ReplicatedBackend.cc
Simple merge
diff --cc src/osd/osd_types.cc
Simple merge
diff --cc src/osd/osd_types.h
Simple merge
author	Kefu Chai <tchaikov@gmail.com>
	Tue, 5 Sep 2017 05:43:05 +0000 (13:43 +0800)
committer	GitHub <noreply@github.com>
	Tue, 5 Sep 2017 05:43:05 +0000 (13:43 +0800)
		1	2
src/osd/ReplicatedBackend.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/osd_types.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/osd_types.h	patch \|	diff1 \|	diff2 \|	blob \| history