From: Daniel Smith <daniel.smith@ericsson.com>
Date: Thu, 4 Aug 2016 02:49:43 +0000 (+0000)
Subject: Merge "Update the Pharos template"
X-Git-Tag: colorado.1.0~22
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=0433af9b1d648eb8295cd6a5981f5cc7dd096304;p=pharos.git

Merge "Update the Pharos template"
---

0433af9b1d648eb8295cd6a5981f5cc7dd096304