projects / arvados.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ce669fb 3b31f11)
Merge branch '8178-keepstore-trash-interface' of git.curoverse.com:arvados into 8178...
authorradhika <radhika@curoverse.com>
Tue, 26 Jan 2016 15:41:00 +0000 (10:41 -0500)
committerradhika <radhika@curoverse.com>
Tue, 26 Jan 2016 15:41:00 +0000 (10:41 -0500)
Conflicts:
services/keepstore/handlers.go
services/keepstore/volume_test.go


Trivial merge