From: Peter Amstutz <peter.amstutz@curoverse.com>
Date: Wed, 10 Jun 2015 13:10:41 +0000 (-0400)
Subject: Merge branch 'master' into 3198-writable-fuse
X-Git-Tag: 1.1.0~1503^2~24
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/900b548097c68649ae2874ded5849f1d8164384c

Merge branch 'master' into 3198-writable-fuse
---

900b548097c68649ae2874ded5849f1d8164384c
diff --cc sdk/python/arvados/arvfile.py
index 2d44d6ad6e,95dcea0ad3..3009a90fa6
--- a/sdk/python/arvados/arvfile.py
+++ b/sdk/python/arvados/arvfile.py
@@@ -9,9 -9,8 +9,9 @@@ import Queu
  import copy
  import errno
  import re
 +import logging
  
- from .errors import KeepWriteError, AssertionError
+ from .errors import KeepWriteError, AssertionError, ArgumentError
  from .keep import KeepLocator
  from ._normalize_stream import normalize_stream
  from ._ranges import locators_and_ranges, replace_range, Range