Merge "Increase timeout for sdc-merge"
authorJeremy Phelps <jphelps@linuxfoundation.org>
Wed, 18 Apr 2018 18:58:09 +0000 (18:58 +0000)
committerGerrit Code Review <gerrit@onap.org>
Wed, 18 Apr 2018 18:58:09 +0000 (18:58 +0000)

Trivial merge