projects
/
arvados.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
af27f8b
6f6f108
)
Merge branch '1977-provenance-report'
author
Tom Clegg <tom@curoverse.com>
Tue, 4 Feb 2014 07:52:28 +0000
(23:52 -0800)
committer
Tom Clegg <tom@curoverse.com>
Tue, 4 Feb 2014 07:52:28 +0000
(23:52 -0800)
1
2
services/api/app/controllers/arvados/v1/collections_controller.rb
patch
|
diff1
|
diff2
|
blob
|
history
services/api/test/fixtures/links.yml
patch
|
diff1
|
diff2
|
blob
|
history
services/api/test/functional/arvados/v1/collections_controller_test.rb
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
services/api/app/controllers/arvados/v1/collections_controller.rb
Simple merge
diff --cc
services/api/test/fixtures/links.yml
Simple merge
diff --cc
services/api/test/functional/arvados/v1/collections_controller_test.rb
Simple merge
projects / arvados.git / commitdiff