Merge "Adding architecture options"
authorRuijing Guo <ruijing.guo@intel.com>
Fri, 4 Aug 2017 06:38:30 +0000 (06:38 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Fri, 4 Aug 2017 06:38:30 +0000 (06:38 +0000)

Trivial merge