Merge "Make daisy template compatible with lf-pod4"
authorjulien zhang <zhang.jun3g@zte.com.cn>
Sun, 10 Sep 2017 14:47:14 +0000 (14:47 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Sun, 10 Sep 2017 14:47:14 +0000 (14:47 +0000)

Trivial merge