Merge "Fix bug 564"

author Adam Israel <adam.israel@canonical.com>

Tue, 19 Mar 2019 21:21:08 +0000 (22:21 +0100)

committer Gerrit Code Review <root@osm.etsi.org>

Tue, 19 Mar 2019 21:21:08 +0000 (22:21 +0100)
author Adam Israel <adam.israel@canonical.com>
Tue, 19 Mar 2019 21:21:08 +0000 (22:21 +0100)
committer Gerrit Code Review <root@osm.etsi.org>
Tue, 19 Mar 2019 21:21:08 +0000 (22:21 +0100)
diff --cc n2vc/vnf.py
Simple merge
diff --cc tests/base.py
Simple merge
author	Adam Israel <adam.israel@canonical.com>
	Tue, 19 Mar 2019 21:21:08 +0000 (22:21 +0100)
committer	Gerrit Code Review <root@osm.etsi.org>
	Tue, 19 Mar 2019 21:21:08 +0000 (22:21 +0100)
		1	2
n2vc/vnf.py	patch \|	diff1 \|	diff2 \|	blob \| history
tests/base.py	patch \|	diff1 \|	diff2 \|	blob \| history