From: Fuad Muhic <fmuhic@capeannenterprises.com>
Date: Tue, 6 Feb 2018 09:46:30 +0000 (+0100)
Subject: Merge branch 'master' of git.curoverse.com:arvados into 11876-r-sdk
X-Git-Tag: 1.1.3~2^2~1
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/10c8c1871bef6d88ae27797e4b389fbf8649f4b0?hp=abdc3d88ac10b8f3b634b4f1edd46e3597d54ee2

Merge branch 'master' of git.curoverse.com:arvados into 11876-r-sdk

Arvados-DCO-1.1-Signed-off-by: Fuad Muhic <fmuhic@capeannenterprises.com>
---

diff --git a/build/libcloud-pin.sh b/build/libcloud-pin.sh
index 4182575651..c795bb8a24 100644
--- a/build/libcloud-pin.sh
+++ b/build/libcloud-pin.sh
@@ -2,4 +2,4 @@
 #
 # SPDX-License-Identifier: AGPL-3.0
 
-LIBCLOUD_PIN=2.2.2.dev3
+LIBCLOUD_PIN=2.2.2.dev4
diff --git a/services/nodemanager/setup.py b/services/nodemanager/setup.py
index 64545eb0f9..7b023570b3 100644
--- a/services/nodemanager/setup.py
+++ b/services/nodemanager/setup.py
@@ -44,14 +44,14 @@ setup(name='arvados-node-manager',
           'setuptools'
       ],
       dependency_links=[
-          "https://github.com/curoverse/libcloud/archive/apache-libcloud-2.2.2.dev3.zip"
+          "https://github.com/curoverse/libcloud/archive/apache-libcloud-2.2.2.dev4.zip"
       ],
       test_suite='tests',
       tests_require=[
           'requests',
           'pbr<1.7.0',
           'mock>=1.0',
-          'apache-libcloud==2.2.2.dev3',
+          'apache-libcloud==2.2.2.dev4',
       ],
       zip_safe=False,
       cmdclass={'egg_info': tagger},