projects / arvados.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2b02467 678f1f4)
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)
Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz@veritasgenetics.com>

1  2 
services/api/app/models/container.rb patch | diff1 | diff2 | blob | history
services/api/test/unit/container_test.rb patch | diff1 | diff2 | blob | history

diff --cc services/api/app/models/container.rb
Simple merge