4523: Merge branch '4523-search-index' of git.curoverse.com:arvados into 4523-search...
authorTom Clegg <tom@curoverse.com>
Mon, 5 Jan 2015 15:05:57 +0000 (10:05 -0500)
committerTom Clegg <tom@curoverse.com>
Mon, 5 Jan 2015 15:05:57 +0000 (10:05 -0500)
commitb6f73f7acffa9b2f37c78826ff6cee89987a7edc
treea6d7e91eebab089c6d9dabe204881eb585ef0b06
parent9468edd5242e5372ce2ed36f2a7448b63a5b45b1
parent49030c3161523bc427e0aaa9d3edb517fc4c296c
4523: Merge branch '4523-search-index' of git.curoverse.com:arvados into 4523-search-index

Conflicts:
services/api/test/unit/arvados_model_test.rb
services/api/test/unit/arvados_model_test.rb