Merge branch 'master' into 4523-search-index
authorRadhika Chippada <radhika@curoverse.com>
Mon, 5 Jan 2015 14:48:35 +0000 (09:48 -0500)
committerRadhika Chippada <radhika@curoverse.com>
Mon, 5 Jan 2015 14:48:35 +0000 (09:48 -0500)
commit49030c3161523bc427e0aaa9d3edb517fc4c296c
tree3ea46b48f5f5f2ce5e8d66bd1398d076193dff80
parentceb2ed3a4f6c68a1c95d92271ba77b5e3d8b6a58
parentc4e7c6d5a1a9604c1c1e53a5aa749eb1e45f92a1
Merge branch 'master' into 4523-search-index

Conflicts:
services/api/db/migrate/20141208164553_owner_uuid_index.rb
services/api/db/structure.sql
services/api/test/unit/arvados_model_test.rb
services/api/test/unit/arvados_model_test.rb