Merge branch 'master' into 10293-container-request-output-uuid

Conflicts:
	services/api/app/models/container_request.rb
	services/api/db/structure.sql

diff --cc services/api/app/models/container_request.rb
index bac4032f67d2b7871009727e4c8c2230b8a0dc2e,7dcfbe378b6700a88b41ae11b6a15e8a28a6fe20..38c4dc15908b69b2d48a5c30f48fd5645e3661b7
--- 1/services/api/app/models/container_request.rb
--- 2/services/api/app/models/container_request.rb
+++ b/services/api/app/models/container_request.rb
@@@ -42,7 -44,7 +44,8 @@@ class ContainerRequest < ArvadosMode
      t.add :runtime_constraints
      t.add :state
      t.add :use_existing
 +    t.add :output_uuid
+     t.add :scheduling_parameters
    end
  
    # Supported states for a container request

diff --cc services/api/db/structure.sql
index a3f4f5578bfebe934d42123444e8b22bdd21518a,1d3d238c837611e2858dbfd0959cfc7373a41917..dd99610fae2f163aa4d22b4b99da47f70bbb3e33
--- 1/services/api/db/structure.sql
--- 2/services/api/db/structure.sql
+++ b/services/api/db/structure.sql
@@@ -292,7 -292,7 +292,8 @@@ CREATE TABLE container_requests 
      updated_at timestamp without time zone NOT NULL,
      container_count integer DEFAULT 0,
      use_existing boolean DEFAULT true,
 -    scheduling_parameters text
++    scheduling_parameters text,
 +    output_uuid character varying(255)
  );
  
  
@@@ -2697,4 -2698,4 +2699,6 @@@ INSERT INTO schema_migrations (version
  
  INSERT INTO schema_migrations (version) VALUES ('20161019171346');
  
- INSERT INTO schema_migrations (version) VALUES ('20161110171221');
++INSERT INTO schema_migrations (version) VALUES ('20161110171221');
++
+ INSERT INTO schema_migrations (version) VALUES ('20161111143147');

diff --cc services/api/test/unit/container_request_test.rb
Simple merge