Merge pull request #17808 from xiexingguo/wip-eqduot-vs-enospc

author Sage Weil <sage@newdream.net>

Fri, 22 Sep 2017 21:09:09 +0000 (16:09 -0500)

committer GitHub <noreply@github.com>

Fri, 22 Sep 2017 21:09:09 +0000 (16:09 -0500)
author Sage Weil <sage@newdream.net>
Fri, 22 Sep 2017 21:09:09 +0000 (16:09 -0500)
committer GitHub <noreply@github.com>
Fri, 22 Sep 2017 21:09:09 +0000 (16:09 -0500)
diff --cc src/osd/OSDMap.cc
Simple merge
diff --cc src/osd/PrimaryLogPG.cc
Simple merge
diff --cc src/osd/osd_types.h
Simple merge
author	Sage Weil <sage@newdream.net>
	Fri, 22 Sep 2017 21:09:09 +0000 (16:09 -0500)
committer	GitHub <noreply@github.com>
	Fri, 22 Sep 2017 21:09:09 +0000 (16:09 -0500)
		1	2
src/osd/OSDMap.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/PrimaryLogPG.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/osd_types.h	patch \|	diff1 \|	diff2 \|	blob \| history