Merge pull request #9825 from liewegas/wip-addrvec

author Kefu Chai <tchaikov@gmail.com>

Tue, 25 Oct 2016 17:38:01 +0000 (01:38 +0800)

committer GitHub <noreply@github.com>

Tue, 25 Oct 2016 17:38:01 +0000 (01:38 +0800)
author Kefu Chai <tchaikov@gmail.com>
Tue, 25 Oct 2016 17:38:01 +0000 (01:38 +0800)
committer GitHub <noreply@github.com>
Tue, 25 Oct 2016 17:38:01 +0000 (01:38 +0800)
diff --cc src/mon/OSDMonitor.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, 25 Oct 2016 17:38:01 +0000 (01:38 +0800)
committer	GitHub <noreply@github.com>
	Tue, 25 Oct 2016 17:38:01 +0000 (01:38 +0800)
		1	2
src/mon/OSDMonitor.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