From: Fatih Degirmenci <fatih.degirmenci@ericsson.com>
Date: Fri, 19 Aug 2016 19:44:40 +0000 (+0000)
Subject: Merge "Adjust bifrost node provisioning timeout and fix file permissions"
X-Git-Tag: colorado.1.0~136
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=52c3cb5a643064865e6c86e0c366d8d5097d2a15;p=releng.git

Merge "Adjust bifrost node provisioning timeout and fix file permissions"
---

52c3cb5a643064865e6c86e0c366d8d5097d2a15
diff --cc prototypes/bifrost/scripts/test-bifrost-deployment.sh
index 807d823e0,ecd05e07b..807d823e0
mode 100644,100755..100755
--- a/prototypes/bifrost/scripts/test-bifrost-deployment.sh
+++ b/prototypes/bifrost/scripts/test-bifrost-deployment.sh