[ARVADOS] updated: 15488bac7de5fa73c2695589c6436a6848615e84

[Git user]

Summary of changes:
 sdk/cli/bin/arv-run-pipeline-instance              |  2 +
 sdk/cwl/arvados_cwl/arvcontainer.py                |  4 +-
 sdk/cwl/tests/test_container.py                    | 23 ++++++++----
 sdk/go/arvados/container.go                        | 38 +++++++++++--------
 .../arvados/v1/collections_controller.rb           |  2 +-
 services/api/app/models/container.rb               | 11 +++++-
 services/api/app/models/container_request.rb       | 20 +++++++++-
 ...43147_add_scheduling_parameters_to_container.rb |  6 +++
 services/api/db/structure.sql                      |  8 +++-
 .../arvados/v1/collections_controller_test.rb      | 43 ++++++++++++++++++++++
 services/api/test/unit/container_request_test.rb   | 32 ++++++++++++++++
 .../crunch-dispatch-slurm/crunch-dispatch-slurm.go |  4 +-
 .../crunch-dispatch-slurm_test.go                  |  2 +-
 13 files changed, 161 insertions(+), 34 deletions(-)
 create mode 100644 services/api/db/migrate/20161111143147_add_scheduling_parameters_to_container.rb

       via  15488bac7de5fa73c2695589c6436a6848615e84 (commit)
       via  02010431f52911a6ff908e673c534291beb929ac (commit)
       via  82fa37ac01169178f6a9b1c142926de7b50e8841 (commit)
       via  0b5d04beb288175a285c36a38f255399dfe7d0d7 (commit)
       via  b86543493dffefb1ec245f48550cfa9e0119f4d1 (commit)
       via  8c7a6b5bb3cf27dff61a3b2d83fd4374c7262206 (commit)
       via  9640930c3934344ab64c92a5c86c1f7488a4de42 (commit)
      from  9cc813f25cb1d0c912c90ad8ed58166cbaaeff1c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 15488bac7de5fa73c2695589c6436a6848615e84
Merge: 9cc813f 0201043
Author: radhika <radhika at curoverse.com>
Date:   Tue Nov 15 10:51:56 2016 -0500

    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 bac4032,7dcfbe3..38c4dc1
--- a/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 a3f4f55,1d3d238..dd99610
--- a/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');

-----------------------------------------------------------------------


hooks/post-receive
--