Merge pull request #74 from mytardis/develop

Merging into master for v0.6.1 build
mytardis · Oct 7, 2016 · d6984d0 · d6984d0
2 parents 09fe314 + 2aa764c
commit d6984d0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/mydata/__init__.py b/mydata/__init__.py
@@ -3,7 +3,7 @@
 """
 import sys
 
-__version__ = "0.6.1-beta4"
+__version__ = "0.6.1"
 
 
 try:

diff --git a/mydata/utils/openssh.py b/mydata/utils/openssh.py
@@ -630,8 +630,8 @@ def UploadFile(filePath, fileSize, username, privateKeyFilePath,
                      "the remote server is larger than the local file "
                      "size for \"%s\"." % filePath)
     elif 0 < bytesUploaded < fileSize:
-        logger.info("MyData will attempt to resume the partially "
-                    "completed upload for \"%s\"..." % filePath)
+        logger.debug("MyData will attempt to resume the partially "
+                     "completed upload for \"%s\"..." % filePath)
     elif bytesUploaded == 0:
         progressCallback(bytesUploaded, fileSize, message="Uploading...")
 
@@ -1217,7 +1217,7 @@ def UploadLargeFileFromWindows(filePath, fileSize, username,
         # from a datafile a little bit at a time (not wasting memory).
         with open(filePath, 'rb') as datafile:
             with open(chunkFilePath, 'wb') as chunkFile:
-                logger.info("Writing chunk to %s" % chunkFilePath)
+                logger.debug("Writing chunk to %s" % chunkFilePath)
                 datafile.seek(skip * chunkSize)
                 bytesTransferred = long(0)
                 smallChunkSize = chunkSize