From: Ruan HE <ruan.he@orange.com>
Date: Mon, 8 Aug 2016 15:34:13 +0000 (+0000)
Subject: Merge "Update configurations"
X-Git-Tag: colorado.1.0~37
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=af6f8145508476953ba65b4e0f3797f849327214;p=moon.git

Merge "Update configurations"
---

af6f8145508476953ba65b4e0f3797f849327214