From: radhika <radhika@curoverse.com>
Date: Fri, 6 Nov 2015 15:35:54 +0000 (-0500)
Subject: Merge branch 'master' into 7490-datamanager-dont-die-return-error
X-Git-Tag: 1.1.0~1240^2~18
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/af6d31cba8346ac86bc0027eb0f675144fb43056

Merge branch 'master' into 7490-datamanager-dont-die-return-error

Conflicts:
	services/datamanager/datamanager_test.go
---

af6d31cba8346ac86bc0027eb0f675144fb43056
diff --cc services/datamanager/datamanager_test.go
index 6ceb1e625e,685f94c88f..26a2fbf92b
--- a/services/datamanager/datamanager_test.go
+++ b/services/datamanager/datamanager_test.go
@@@ -33,11 -28,8 +28,12 @@@ func SetupDataManagerTest(t *testing.T
  	arvadostest.StartAPI()
  	arvadostest.StartKeep(2, false)
  
 -	arv = makeArvadosClient()
 +	var err error
 +	arv, err = makeArvadosClient()
 +	if err != nil {
 +		t.Fatalf("Error making arvados client: %s", err)
 +	}
+ 	arv.ApiToken = arvadostest.DataManagerToken
  
  	// keep client
  	keepClient = &keepclient.KeepClient{