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)
commitdaa3cc42efa55ad17df2a151aebaac515d10cc52
tree31009543da448fb22b57c52cd25eade79fce9756
parentce669fb969b7669dc1f672214f96404fcd141455
parent3b31f110db82c93c3aade294f50bbb0218c74697
Merge branch '8178-keepstore-trash-interface' of git.curoverse.com:arvados into 8178-keepstore-trash-interface

Conflicts:
services/keepstore/handlers.go
services/keepstore/volume_test.go