[ARVADOS] updated: d97be42e8dd9a9495480b8c1e2a83db46b79cb5c

[git at public.curoverse.com]

Summary of changes:
 services/api/app/models/job.rb                               |  8 ++++++++
 services/api/db/migrate/20140828141043_job_priority_fixup.rb | 11 +++++++++++
 services/api/db/structure.sql                                |  6 ++++--
 services/api/test/fixtures/jobs.yml                          | 12 ++++++------
 .../api/test/functional/arvados/v1/jobs_controller_test.rb   |  1 +
 5 files changed, 30 insertions(+), 8 deletions(-)
 create mode 100644 services/api/db/migrate/20140828141043_job_priority_fixup.rb

       via  d97be42e8dd9a9495480b8c1e2a83db46b79cb5c (commit)
       via  7f3ed5e22e01b9cc8efe9ebfc79a2591b37b14d7 (commit)
       via  04bce28b705a6ca33d2c9b19aa783f588a99c8e0 (commit)
       via  80cbf4d912084fd80930cef112189024071eb4eb (commit)
       via  38dc6b9ddabb0e0e76128bfc4ff372f597d8e25e (commit)
       via  bf1f3980c2ec62969b663c1665cb0818e118dfba (commit)
      from  50e48820312868513b6efcafa84c6d825ac51cd4 (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 d97be42e8dd9a9495480b8c1e2a83db46b79cb5c
Merge: 50e4882 7f3ed5e
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Tue Sep 9 09:25:27 2014 -0400

    Merge branch '3586-job-priority' closes #3586


commit 7f3ed5e22e01b9cc8efe9ebfc79a2591b37b14d7
Merge: 04bce28 50e4882
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Mon Sep 8 16:56:51 2014 -0400

    Merge branch 'master' into 3586-job-priority closes #3586


commit 04bce28b705a6ca33d2c9b19aa783f588a99c8e0
Merge: 80cbf4d 94982cd
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Tue Sep 2 16:16:13 2014 -0400

    Merge branch 'master' into 3586-job-priority
    
    Conflicts:
    	services/api/db/structure.sql

diff --cc services/api/db/structure.sql
index 55a93f3,8fb3416..bd86826
--- a/services/api/db/structure.sql
+++ b/services/api/db/structure.sql
@@@ -427,10 -428,7 +427,8 @@@ CREATE TABLE jobs 
      nondeterministic boolean,
      repository character varying(255),
      supplied_script_version character varying(255),
 -    docker_image_locator character varying(255)
 +    docker_image_locator character varying(255),
-     name character varying(255),
-     description text,
 +    priority integer DEFAULT 0 NOT NULL
  );
  
  
@@@ -2019,5 -2010,3 +2010,5 @@@ INSERT INTO schema_migrations (version
  INSERT INTO schema_migrations (version) VALUES ('20140818125735');
  
  INSERT INTO schema_migrations (version) VALUES ('20140826180337');
 +
- INSERT INTO schema_migrations (version) VALUES ('20140828141043');
++INSERT INTO schema_migrations (version) VALUES ('20140828141043');

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


hooks/post-receive
--