Merge pull request #22007 from dalgaaf/wip-da-SCA-20180514

author Kefu Chai <tchaikov@gmail.com>

Thu, 28 Jun 2018 15:39:55 +0000 (23:39 +0800)

committer GitHub <noreply@github.com>

Thu, 28 Jun 2018 15:39:55 +0000 (23:39 +0800)
author Kefu Chai <tchaikov@gmail.com>
Thu, 28 Jun 2018 15:39:55 +0000 (23:39 +0800)
committer GitHub <noreply@github.com>
Thu, 28 Jun 2018 15:39:55 +0000 (23:39 +0800)
diff --cc src/include/denc.h
Simple merge
diff --cc src/librbd/io/ImageDispatchSpec.cc
Simple merge
diff --cc src/librbd/io/ImageRequestWQ.cc
Simple merge
diff --cc src/mgr/Mgr.cc
Simple merge
author	Kefu Chai <tchaikov@gmail.com>
	Thu, 28 Jun 2018 15:39:55 +0000 (23:39 +0800)
committer	GitHub <noreply@github.com>
	Thu, 28 Jun 2018 15:39:55 +0000 (23:39 +0800)
		1	2
src/include/denc.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/librbd/io/ImageDispatchSpec.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/librbd/io/ImageRequestWQ.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/mgr/Mgr.cc	patch \|	diff1 \|	diff2 \|	blob \| history