From: Lucas Di Pentima <lucas@curoverse.com>
Date: Fri, 9 Dec 2016 22:30:02 +0000 (-0300)
Subject: 10383: Merge branch 'master' into 10383-arv-put-incremental-upload
X-Git-Tag: 1.1.0~530^2~10
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/2e104941dbf1e4bf92e0632cadeb946be0595d67

10383: Merge branch 'master' into 10383-arv-put-incremental-upload
---

2e104941dbf1e4bf92e0632cadeb946be0595d67
diff --cc sdk/python/arvados/commands/put.py
index 88956cdce6,e3b41b26d3..88d5a79d48
--- a/sdk/python/arvados/commands/put.py
+++ b/sdk/python/arvados/commands/put.py
@@@ -22,8 -20,10 +22,9 @@@ import socke
  import sys
  import tempfile
  import threading
 -import copy
 -import logging
 +import time
  from apiclient import errors as apiclient_errors
+ from arvados._version import __version__
  
  import arvados.commands._util as arv_cmd