Merge branch '6203-collection-perf-api-TC' of git.curoverse.com:arvados into 6203...
authorradhika <radhika@curoverse.com>
Wed, 10 Jun 2015 14:06:35 +0000 (10:06 -0400)
committerradhika <radhika@curoverse.com>
Wed, 10 Jun 2015 14:06:35 +0000 (10:06 -0400)
commitdb6c09cc6dfa9d50a18261332deb59dc6f7c0421
tree9bc32064a6e1680c471f6dc346caae622944113c
parent7d838bbf3337b2600fecb93322e6466b9a690a42
parent02156d71070b21872d2dac3c5912c9a1ccd8d684
Merge branch '6203-collection-perf-api-TC' of git.curoverse.com:arvados into 6203-collection-perf-api-TC

Conflicts:
services/api/app/models/collection.rb