Merge "Sunset stack support" into stable/iruya

author Mark Beierl <mbeierl@vmware.com>

Mon, 6 Jan 2020 16:41:49 +0000 (16:41 +0000)

committer Gerrit Code Review <gerrit@opnfv.org>

Mon, 6 Jan 2020 16:41:49 +0000 (16:41 +0000)
author Mark Beierl <mbeierl@vmware.com>
Mon, 6 Jan 2020 16:41:49 +0000 (16:41 +0000)
committer Gerrit Code Review <gerrit@opnfv.org>
Mon, 6 Jan 2020 16:41:49 +0000 (16:41 +0000)
diff --cc docker/storperf-master/rest_server.py
Simple merge
diff --cc docs/testing/user/test-usage.rst
Simple merge
author	Mark Beierl <mbeierl@vmware.com>
	Mon, 6 Jan 2020 16:41:49 +0000 (16:41 +0000)
committer	Gerrit Code Review <gerrit@opnfv.org>
	Mon, 6 Jan 2020 16:41:49 +0000 (16:41 +0000)
		1	2
docker/storperf-master/rest_server.py	patch \|	diff1 \|	diff2 \|	blob \| history
docs/testing/user/test-usage.rst	patch \|	diff1 \|	diff2 \|	blob \| history