projects / arvados.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6ac861f a4d0d55)
Merge branch '8178-keepstore-trash-interface' of git.curoverse.com:arvados into 8178...
authorradhika <radhika@curoverse.com>
Fri, 22 Jan 2016 22:49:08 +0000 (17:49 -0500)
committerradhika <radhika@curoverse.com>
Fri, 22 Jan 2016 22:49:08 +0000 (17:49 -0500)
Conflicts:
services/keepstore/azure_blob_volume.go
services/keepstore/handler_test.go
services/keepstore/handlers.go
services/keepstore/keepstore.go
services/keepstore/s3_volume.go
services/keepstore/volume_test.go
services/keepstore/volume_unix.go


Trivial merge