Merge "Convert Unlinked Git Submodules to Intersphinx"

author Aric Gardner <agardner@linuxfoundation.org>

Mon, 29 Oct 2018 18:44:27 +0000 (18:44 +0000)

committer Gerrit Code Review <gerrit@opnfv.org>

Mon, 29 Oct 2018 18:44:27 +0000 (18:44 +0000)
author Aric Gardner <agardner@linuxfoundation.org>
Mon, 29 Oct 2018 18:44:27 +0000 (18:44 +0000)
committer Gerrit Code Review <gerrit@opnfv.org>
Mon, 29 Oct 2018 18:44:27 +0000 (18:44 +0000)
diff --cc .gitmodules
Simple merge
diff --cc docs/conf.py
Simple merge
author	Aric Gardner <agardner@linuxfoundation.org>
	Mon, 29 Oct 2018 18:44:27 +0000 (18:44 +0000)
committer	Gerrit Code Review <gerrit@opnfv.org>
	Mon, 29 Oct 2018 18:44:27 +0000 (18:44 +0000)
		1	2
.gitmodules	patch \|	diff1 \|	diff2 \|	blob \| history
docs/conf.py	patch \|	diff1 \|	diff2 \|	blob \| history