Merge "Fix NS Scale serializers error"

author Fu Jinhua <fu.jinhua@zte.com.cn>

Thu, 4 Apr 2019 01:02:22 +0000 (01:02 +0000)

committer Gerrit Code Review <gerrit@onap.org>

Thu, 4 Apr 2019 01:02:22 +0000 (01:02 +0000)
author Fu Jinhua <fu.jinhua@zte.com.cn>
Thu, 4 Apr 2019 01:02:22 +0000 (01:02 +0000)
committer Gerrit Code Review <gerrit@onap.org>
Thu, 4 Apr 2019 01:02:22 +0000 (01:02 +0000)
diff --cc lcm/ns/tests/test_sol_ns_scale_api.py
Simple merge
author	Fu Jinhua <fu.jinhua@zte.com.cn>
	Thu, 4 Apr 2019 01:02:22 +0000 (01:02 +0000)
committer	Gerrit Code Review <gerrit@onap.org>
	Thu, 4 Apr 2019 01:02:22 +0000 (01:02 +0000)