[ARVADOS] updated: 1.1.3-214-g4b56377

[Git user]

Summary of changes:
 services/api/app/models/container.rb               |  53 ++++---
 services/api/app/models/container_request.rb       |  22 +--
 ...80313180114_change_container_priority_bigint.rb |   5 +
 services/api/db/structure.sql                      |   4 +-
 services/api/test/unit/container_request_test.rb   | 166 +++++++++++++--------
 services/api/test/unit/container_test.rb           |   6 +-
 services/crunch-dispatch-slurm/squeue.go           |  10 +-
 7 files changed, 166 insertions(+), 100 deletions(-)
 create mode 100644 services/api/db/migrate/20180313180114_change_container_priority_bigint.rb

       via  4b563772c0dcbca24c75c0fe5aafab1009b0e3c7 (commit)
       via  5b5be8dfac71c7db9d5a966485fa04f24fd20957 (commit)
       via  4de1b42b8b8538da3e4d16b1692c99824e51eb29 (commit)
       via  a9065fd962827b2cfae7993b550a386821a08dcb (commit)
      from  5282d5462d86721c73849c2e5f3d057657c74b51 (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 4b563772c0dcbca24c75c0fe5aafab1009b0e3c7
Merge: 5282d54 5b5be8d
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date:   Wed Mar 14 15:10:56 2018 -0400

    Merge branch '12552-wf-priority'
    
    refs #12552
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>


commit 5b5be8dfac71c7db9d5a966485fa04f24fd20957
Merge: 4de1b42 5282d54
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date:   Wed Mar 14 14:15:15 2018 -0400

    12552: Merge branch 'master' into 12552-wf-priority
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>


commit 4de1b42b8b8538da3e4d16b1692c99824e51eb29
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date:   Wed Mar 14 14:13:11 2018 -0400

    12552: Fix workflow parent priority test.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>

diff --git a/services/api/test/unit/container_request_test.rb b/services/api/test/unit/container_request_test.rb
index a2c5279..70ad11e 100644
--- a/services/api/test/unit/container_request_test.rb
+++ b/services/api/test/unit/container_request_test.rb
@@ -325,8 +325,8 @@ class ContainerRequestTest < ActiveSupport::TestCase
     set_user_from_auth :active
 
     # parents should be prioritized by submit time.
-    assert_operator children[0].priority, :>, children[1].priority
-    assert_operator children[1].priority, :>, children[2].priority
+    assert_operator parents[0].priority, :>, parents[1].priority
+    assert_operator parents[1].priority, :>, parents[2].priority
 
     # children should be prioritized in same order as their respective
     # parents.

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


hooks/post-receive
--