Merge branch '1977-provenance-report'
authorTom Clegg <tom@curoverse.com>
Tue, 4 Feb 2014 07:52:28 +0000 (23:52 -0800)
committerTom Clegg <tom@curoverse.com>
Tue, 4 Feb 2014 07:52:28 +0000 (23:52 -0800)
commit80be122d6b73044f5e3f740b5c38a38d3b3f79d7
tree6843860ef4540a08cdacb5413b1aae669d032440
parentaf27f8b8031eb8335e04a775642b4c46b30b79f6
parent6f6f108d9d5bcb2e2a033bb16ac5dd78e108291f
Merge branch '1977-provenance-report'
services/api/app/controllers/arvados/v1/collections_controller.rb
services/api/test/fixtures/links.yml
services/api/test/functional/arvados/v1/collections_controller_test.rb