From: radhika <radhika@curoverse.com>
Date: Thu, 26 Nov 2015 05:53:55 +0000 (-0500)
Subject: Merge branch 'master' into 7253-add-go-sdk-manifest
X-Git-Tag: 1.1.0~1059^2~6^2~55^2
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/fc413df044d945ac7620b0220980b23698cc1f5d?hp=c6d5c89d0581b6f93793ed9e43d3ec28bc3488e1

Merge branch 'master' into 7253-add-go-sdk-manifest
---

diff --git a/jenkins/run-tests.sh b/jenkins/run-tests.sh
index b959cabe7b..7a3a64e5df 100755
--- a/jenkins/run-tests.sh
+++ b/jenkins/run-tests.sh
@@ -397,7 +397,7 @@ setup_virtualenv() {
     fi
     "$venvdest/bin/pip" install 'setuptools>=18' 'pip>=7'
     # ubuntu1404 can't seem to install mock via tests_require, but it can do this.
-    "$venvdest/bin/pip" install 'mock>=1.0'
+    "$venvdest/bin/pip" install 'mock>=1.0' 'pbr<1.7.0'
 }
 
 export PERLINSTALLBASE