Merge "bugfix: testapi is killed because of oom_kill"
authorSerena Feng <feng.xiaowei@zte.com.cn>
Fri, 18 Aug 2017 01:00:25 +0000 (01:00 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Fri, 18 Aug 2017 01:00:25 +0000 (01:00 +0000)

Trivial merge