From: Tom Clegg <tclegg@veritasgenetics.com>
Date: Thu, 5 Apr 2018 20:14:35 +0000 (-0400)
Subject: 13111: Merge branch 'master' into 13111-webdav-projects
X-Git-Tag: 1.2.0~199^2~18
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/418c57bce3aac1a22548e53e1018a1547d9efee4

13111: Merge branch 'master' into 13111-webdav-projects

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg@veritasgenetics.com>
---

418c57bce3aac1a22548e53e1018a1547d9efee4
diff --cc services/keep-web/webdav.go
index 3e62b19bbe,432c6af6d8..5b23c9c5fa
--- a/services/keep-web/webdav.go
+++ b/services/keep-web/webdav.go
@@@ -47,10 -47,7 +47,10 @@@ type webdavFS struct 
  }
  
  func (fs *webdavFS) makeparents(name string) {
 +	if !fs.writing {
 +		return
 +	}
- 	dir, name := path.Split(name)
+ 	dir, _ := path.Split(name)
  	if dir == "" || dir == "/" {
  		return
  	}