Merge "Change MININET to TOOLS_SYSTEM_IP in get-slave-addresses.sh"

author Vratko Polák <vrpolak@cisco.com>

Tue, 13 Oct 2015 10:06:46 +0000 (10:06 +0000)

committer Gerrit Code Review <gerrit@opendaylight.org>

Tue, 13 Oct 2015 10:06:46 +0000 (10:06 +0000)
author Vratko Polák <vrpolak@cisco.com>
Tue, 13 Oct 2015 10:06:46 +0000 (10:06 +0000)
committer Gerrit Code Review <gerrit@opendaylight.org>
Tue, 13 Oct 2015 10:06:46 +0000 (10:06 +0000)
diff --cc jjb/integration/include-raw-integration-deploy-controller-run-test.sh
Simple merge
diff --cc jjb/integration/include-raw-integration-start-cluster-run-test.sh
Simple merge
author	Vratko Polák <vrpolak@cisco.com>
	Tue, 13 Oct 2015 10:06:46 +0000 (10:06 +0000)
committer	Gerrit Code Review <gerrit@opendaylight.org>
	Tue, 13 Oct 2015 10:06:46 +0000 (10:06 +0000)
		1	2
jjb/integration/include-raw-integration-deploy-controller-run-test.sh	patch \|	diff1 \|	diff2 \|	blob \| history
jjb/integration/include-raw-integration-start-cluster-run-test.sh	patch \|	diff1 \|	diff2 \|	blob \| history