Merge branch '12032-project-trash' refs #12032
authorPeter Amstutz <peter.amstutz@curoverse.com>
Mon, 25 Sep 2017 19:39:50 +0000 (15:39 -0400)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Mon, 25 Sep 2017 19:39:54 +0000 (15:39 -0400)
commit68bdf4cbb1d2c22d689b1d74a1c2a77415921b4d
tree2eae363ae4f7b38a156805ce9caa2e97b2811166
parent2b024674dd3de3485310e3b7a487d3748316b321
parent678f1f40ee15706750d2e6d6868a642e065c57a8
Merge branch '12032-project-trash' refs #12032

Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz@veritasgenetics.com>
services/api/app/models/container.rb
services/api/test/unit/container_test.rb