Merge remote-tracking branch 'upstream/master' into python-registry-v2

2015-09-17 16:16:27 -04:00 · 2015-09-17 16:16:27 -04:00 · 26cea9a07c
commit 26cea9a07c
parent 816536f648 0316f6e471
96 changed files with 2044 additions and 626 deletions
--- a/storage/local.py
+++ b/storage/local.py
@ -123,7 +123,7 @@ class LocalStorage(BaseStorageV2):
    content_path = self._init_path(self._rel_upload_path(uuid))
    os.remove(content_path)

-  def validate(self):
+  def validate(self, client):
    # Load the set of disk mounts.
    try:
      mounts = psutil.disk_partitions(all=True)