From: jose.lausuch <jose.lausuch@ericsson.com>
Date: Tue, 2 Feb 2016 08:45:42 +0000 (+0000)
Subject: Merge "Use generate_defaults instead of os_defaults fixed parameters"
X-Git-Tag: colorado.1.0~547
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=a0ecc366c97cc66a2120a39987b909d30af141da;p=functest.git

Merge "Use generate_defaults instead of os_defaults fixed parameters"
---

a0ecc366c97cc66a2120a39987b909d30af141da