Merge "Addition of Prox NSB changes in yardstick"
authorRoss Brattain <ross.b.brattain@intel.com>
Tue, 5 Sep 2017 13:02:33 +0000 (13:02 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Tue, 5 Sep 2017 13:02:33 +0000 (13:02 +0000)

Trivial merge