[ARVADOS] updated: 1.1.4-352-g4869ae0

[Git user]

Summary of changes:
 services/api/app/models/container.rb         |  8 ++----
 services/api/app/models/container_request.rb |  2 --
 services/api/lib/update_priority.rb          | 38 ++++++++++++++++++++++++++++
 3 files changed, 40 insertions(+), 8 deletions(-)
 create mode 100644 services/api/lib/update_priority.rb

       via  4869ae0f12b5a4a293c66f7304483fee1addae52 (commit)
       via  7e6ac5a4967614cbe59ed5c0ec41c8be4d4cff4d (commit)
      from  783523246354d49b5cba8c36bb2913831e5f8e52 (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 4869ae0f12b5a4a293c66f7304483fee1addae52
Merge: 7835232 7e6ac5a
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date:   Tue Jun 5 12:57:23 2018 -0400

    Merge branch '13164-cr-locking'
    
    refs #13164
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>


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


hooks/post-receive
--