From: radhika <radhika@curoverse.com>
Date: Wed, 10 Jun 2015 14:06:35 +0000 (-0400)
Subject: Merge branch '6203-collection-perf-api-TC' of git.curoverse.com:arvados into 6203... 
X-Git-Tag: 1.1.0~1558^2
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/db6c09cc6dfa9d50a18261332deb59dc6f7c0421

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
---

db6c09cc6dfa9d50a18261332deb59dc6f7c0421