Merge "Increase the mariadb deploy timeout"
authorChristophe Closset <cc697w@intl.att.com>
Fri, 7 Jul 2017 13:52:03 +0000 (13:52 +0000)
committerGerrit Code Review <gerrit@onap.org>
Fri, 7 Jul 2017 13:52:03 +0000 (13:52 +0000)

Trivial merge