[ARVADOS] updated: 1.1.3-137-g07a0906

[Git user]

Summary of changes:
 build/libcloud-pin.sh         | 2 +-
 build/run-tests.sh            | 6 +++++-
 services/nodemanager/setup.py | 7 ++-----
 3 files changed, 8 insertions(+), 7 deletions(-)

       via  07a09069c579e51c33c6fb267b2e510cc8f98ea8 (commit)
       via  69ae9c5a8d7e2df93ece51afd4eb471c745eb84c (commit)
       via  8e2a634e2b0ef180f30db5322233244b142f93f6 (commit)
      from  9c983060b6f0fc6dc42310587b9858b7f8b968de (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 07a09069c579e51c33c6fb267b2e510cc8f98ea8
Merge: 9c98306 69ae9c5
Author: Lucas Di Pentima <ldipentima at veritasgenetics.com>
Date:   Mon Mar 5 18:49:58 2018 -0300

    Merge branch '12268-libcloud230-official'
    Closes #12268
    
    Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <ldipentima at veritasgenetics.com>

diff --cc build/run-tests.sh
index 269ed0c,2f35999..09f9c39
--- a/build/run-tests.sh
+++ b/build/run-tests.sh
@@@ -540,13 -526,13 +540,17 @@@ setup_virtualenv "$VENVDIR" --python py
  
  # Needed for run_test_server.py which is used by certain (non-Python) tests.
  pip freeze 2>/dev/null | egrep ^PyYAML= \
 -    || pip install PyYAML >/dev/null \
 +    || pip install --no-cache-dir PyYAML >/dev/null \
      || fatal "pip install PyYAML failed"
  
- # Preinstall forked version of libcloud, because nodemanager "pip install"
+ # 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
      || 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
--