Merge "pass user_data to heat template"
authorRoss Brattain <ross.b.brattain@intel.com>
Wed, 10 May 2017 15:08:26 +0000 (15:08 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Wed, 10 May 2017 15:08:26 +0000 (15:08 +0000)
1  2 
tests/unit/benchmark/contexts/test_model.py
yardstick/benchmark/contexts/model.py

Simple merge