Merge "NSBperf: don't exit during import time"
authorRoss Brattain <ross.b.brattain@intel.com>
Mon, 31 Jul 2017 18:50:53 +0000 (18:50 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Mon, 31 Jul 2017 18:50:53 +0000 (18:50 +0000)

Trivial merge