Merge branch 'master' into 4523-search-index
authorRadhika Chippada <radhika@curoverse.com>
Thu, 11 Dec 2014 14:22:20 +0000 (09:22 -0500)
committerRadhika Chippada <radhika@curoverse.com>
Thu, 11 Dec 2014 14:22:20 +0000 (09:22 -0500)
commitf7e3001b53e9f26fd1d413308093bb9700bb9287
treed6287464ef02675b705b4cd6ea561e248507b193
parente11eaaf4620e9d5da4e575f8139c4c4c372604ec
parent181e90a0934d0057202b92010a96139df934aaf1
Merge branch 'master' into 4523-search-index
apps/workbench/test/integration/pipeline_instances_test.rb
services/api/app/models/arvados_model.rb