[ARVADOS] updated: 1.1.3-138-g1eb2ff9

[Git user]

Summary of changes:
 build/run-tests.sh | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

       via  1eb2ff90186bb24b6e2ecc73c31e9e2992ce27e9 (commit)
      from  07a09069c579e51c33c6fb267b2e510cc8f98ea8 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 1eb2ff90186bb24b6e2ecc73c31e9e2992ce27e9
Author: Lucas Di Pentima <ldipentima at veritasgenetics.com>
Date:   Mon Mar 5 18:58:17 2018 -0300

    12268: Fix merge conflict.
    Refs #12268
    
    Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <ldipentima at veritasgenetics.com>

diff --git a/build/run-tests.sh b/build/run-tests.sh
index 09f9c39..9081d99 100755
--- a/build/run-tests.sh
+++ b/build/run-tests.sh
@@ -546,11 +546,7 @@ pip freeze 2>/dev/null | egrep ^PyYAML= \
 # Preinstall libcloud, because nodemanager "pip install"
 # won't pick it up by default.
 pip freeze 2>/dev/null | egrep ^apache-libcloud==$LIBCLOUD_PIN \
-<<<<<<< HEAD
-    || pip install --pre --ignore-installed  --no-cache-dir https://github.com/curoverse/libcloud/archive/apache-libcloud-$LIBCLOUD_PIN.zip >/dev/null \
-=======
-    || pip install apache-libcloud>=$LIBCLOUD_PIN >/dev/null \
->>>>>>> 12268-libcloud230-official
+    || pip install --pre --ignore-installed --no-cache-dir apache-libcloud>=$LIBCLOUD_PIN >/dev/null \
     || fatal "pip install apache-libcloud failed"
 
 # We need an unreleased (as of 2017-08-17) llfuse bugfix, otherwise our fuse test suite deadlocks.

-----------------------------------------------------------------------


hooks/post-receive
--