Merge "Ignore rally_conf.json"
authorCedric Ollivier <ollivier.cedric@gmail.com>
Mon, 17 Oct 2016 12:58:12 +0000 (12:58 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Mon, 17 Oct 2016 12:58:12 +0000 (12:58 +0000)

Trivial merge