Merge "prototypes: bifrost: Increase default provision timeout to 3600 seconds"
authorFatih Degirmenci <fatih.degirmenci@ericsson.com>
Thu, 1 Dec 2016 12:36:25 +0000 (12:36 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Thu, 1 Dec 2016 12:36:25 +0000 (12:36 +0000)

Trivial merge