Merge "Add API network support"

author Tim Rozet <trozet@redhat.com>

Thu, 9 Jun 2016 20:17:27 +0000 (20:17 +0000)

committer Gerrit Code Review <gerrit@172.30.200.206>

Thu, 9 Jun 2016 20:17:27 +0000 (20:17 +0000)
author Tim Rozet <trozet@redhat.com>
Thu, 9 Jun 2016 20:17:27 +0000 (20:17 +0000)
committer Gerrit Code Review <gerrit@172.30.200.206>
Thu, 9 Jun 2016 20:17:27 +0000 (20:17 +0000)
diff --cc ci/clean.sh
Simple merge
diff --cc ci/deploy.sh
Simple merge
diff --cc lib/python/apex/network_environment.py
Simple merge
author	Tim Rozet <trozet@redhat.com>
	Thu, 9 Jun 2016 20:17:27 +0000 (20:17 +0000)
committer	Gerrit Code Review <gerrit@172.30.200.206>
	Thu, 9 Jun 2016 20:17:27 +0000 (20:17 +0000)
		1	2
ci/clean.sh	patch \|	diff1 \|	diff2 \|	blob \| history
ci/deploy.sh	patch \|	diff1 \|	diff2 \|	blob \| history
lib/python/apex/network_environment.py	patch \|	diff1 \|	diff2 \|	blob \| history