From: Dan Radez <dradez@redhat.com>
Date: Fri, 6 May 2016 12:45:47 +0000 (+0000)
Subject: Merge "Rebasing opnfv-tht Colorado with ODL patches"
X-Git-Tag: colorado.1.0~239
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=5c45d868e4cf4eaf54ae52eae6aadcd982898024;p=apex.git

Merge "Rebasing opnfv-tht Colorado with ODL patches"
---

5c45d868e4cf4eaf54ae52eae6aadcd982898024
diff --cc ci/util.sh
index 3e50d96b,6eb6c035..be4fab59
mode 100644,100755..100755
--- a/ci/util.sh
+++ b/ci/util.sh