Merge branch 'master' into 13773-will-fail-container-status

Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <ldipentima@veritasgenetics.com>

diff --cc sdk/cwl/arvados_cwl/__init__.py
Simple merge

diff --cc sdk/cwl/arvados_cwl/arvcontainer.py
Simple merge

diff --cc services/api/app/models/container.rb
Simple merge

diff --cc services/api/db/structure.sql
index d1559c4c6bdaa94c1728e4c14c8d2928fa9d3b11,32b77ed17aa0a4b511fafb50dd04c7d5f45371fa..427c9afb561f20eb4916517d766731de6c126b84
--- 1/services/api/db/structure.sql
--- 2/services/api/db/structure.sql
+++ b/services/api/db/structure.sql
@@@ -1914,13 -1927,20 +1928,27 @@@ CREATE INDEX index_containers_on_modifi
  CREATE INDEX index_containers_on_owner_uuid ON public.containers USING btree (owner_uuid);
  
  
+ --
+ -- Name: index_containers_on_queued_state; Type: INDEX; Schema: public; Owner: -
+ --
+ 
+ CREATE INDEX index_containers_on_queued_state ON public.containers USING btree (state, ((priority > 0)));
+ 
+ 
+ --
+ -- Name: index_containers_on_reuse_columns; Type: INDEX; Schema: public; Owner: -
+ --
+ 
+ CREATE INDEX index_containers_on_reuse_columns ON public.containers USING btree (md5(command), cwd, md5(environment), output_path, container_image, md5(mounts), secret_mounts_md5, md5(runtime_constraints));
+ 
+ 
 +--
 +-- Name: index_containers_on_runtime_status; Type: INDEX; Schema: public; Owner: -
 +--
 +
 +CREATE INDEX index_containers_on_runtime_status ON public.containers USING gin (runtime_status);
 +
 +
  --
  -- Name: index_containers_on_secret_mounts_md5; Type: INDEX; Schema: public; Owner: -
  --
@@@ -3131,7 -3151,11 +3159,13 @@@ INSERT INTO schema_migrations (version
  
  INSERT INTO schema_migrations (version) VALUES ('20180820130357');
  
+ INSERT INTO schema_migrations (version) VALUES ('20180820132617');
+ 
  INSERT INTO schema_migrations (version) VALUES ('20180820135808');
  
+ INSERT INTO schema_migrations (version) VALUES ('20180824152014');
+ 
+ INSERT INTO schema_migrations (version) VALUES ('20180824155207');
+ 
 +INSERT INTO schema_migrations (version) VALUES ('20180904110712');
 +