Merge "Rebasing opnfv-tht Colorado with ODL patches"

author Dan Radez <dradez@redhat.com>

Fri, 6 May 2016 12:45:47 +0000 (12:45 +0000)

committer Gerrit Code Review <gerrit@172.30.200.206>

Fri, 6 May 2016 12:45:47 +0000 (12:45 +0000)
author Dan Radez <dradez@redhat.com>
Fri, 6 May 2016 12:45:47 +0000 (12:45 +0000)
committer Gerrit Code Review <gerrit@172.30.200.206>
Fri, 6 May 2016 12:45:47 +0000 (12:45 +0000)
diff --cc ci/util.sh

index 3e50d96,6eb6c03..be4fab5

mode 100644,100755..100755
--- 1/ci/util.sh
--- 2/ci/util.sh
+++ b/ci/util.sh
author	Dan Radez <dradez@redhat.com>
	Fri, 6 May 2016 12:45:47 +0000 (12:45 +0000)
committer	Gerrit Code Review <gerrit@172.30.200.206>
	Fri, 6 May 2016 12:45:47 +0000 (12:45 +0000)