Merge branch '4523-search-index-TC' into 4523-search-index
authorRadhika Chippada <radhika@curoverse.com>
Wed, 14 Jan 2015 20:21:03 +0000 (15:21 -0500)
committerRadhika Chippada <radhika@curoverse.com>
Wed, 14 Jan 2015 20:21:03 +0000 (15:21 -0500)
commit93e77cdfaec21c3f53bf9efa3cfddb75971b12b7
tree4ded8d1e2e03fb8dad4049227c8a8aacb4a5cd47
parentdde9d2845e69c4e2b50964e6a00f3fdb9053dbf6
parentf5588e5c01baf3084ad42d8be506c4698b1affce
Merge branch '4523-search-index-TC' into 4523-search-index

Conflicts:
services/api/test/integration/collections_api_test.rb