From: Cedric Ollivier <ollivier.cedric@gmail.com>
Date: Mon, 17 Oct 2016 12:58:12 +0000 (+0000)
Subject: Merge "Ignore rally_conf.json"
X-Git-Tag: danube.1.RC1~364
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=9b123ca35d1bf8f7a9320d976f1f0e2425549df0;p=functest.git

Merge "Ignore rally_conf.json"
---

9b123ca35d1bf8f7a9320d976f1f0e2425549df0