Merge branch 'master' into 5538-arvadosclient-retry
authorradhika <radhika@curoverse.com>
Wed, 4 Nov 2015 22:11:10 +0000 (17:11 -0500)
committerradhika <radhika@curoverse.com>
Wed, 4 Nov 2015 22:11:10 +0000 (17:11 -0500)
commit579f6139c9c03fe1b08993746c87aa525ff314e9
tree36fff0c5e01431aacb14fb2007379bc81b9b32e3
parentcabef98fc6cec3b9616d0c76ba469184b9dce693
parent6b606a655410d9ed5116c3a3b6b6971bd90f9666
Merge branch 'master' into 5538-arvadosclient-retry

Conflicts:
sdk/go/arvadosclient/arvadosclient.go
sdk/go/arvadosclient/arvadosclient.go
sdk/go/arvadosclient/arvadosclient_test.go