projects / arvados.git / commit
summary | shortlog | log | commit | commitdiff | tree
(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)
commit3b31f110db82c93c3aade294f50bbb0218c74697
tree684f78bc09d298ea33d156cc9f0861322ab2afactree | snapshot
parent6ac861fd4a44cb39371a66d96b77ad7a41c85d3bcommit | diff
parenta4d0d55ac333e8060d13a600d8aa8f5443760b29commit | diff
Merge branch '8178-keepstore-trash-interface' of git.curoverse.com:arvados into 8178-keepstore-trash-interface

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