From: Ross Brattain <ross.b.brattain@intel.com>
Date: Wed, 20 Sep 2017 20:57:29 +0000 (+0000)
Subject: Merge "Heat: use pkey from string instead of key_filename"
X-Git-Tag: opnfv-6.0.0~443
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=62c775f7261dca0081283fadcaa18e53cf2f181c;p=yardstick.git

Merge "Heat: use pkey from string instead of key_filename"
---

62c775f7261dca0081283fadcaa18e53cf2f181c