[ARVADOS] updated: 1.3.0-374-gd97388bdb

[Git user]

Summary of changes:
 lib/controller/federation_test.go                  | 24 ++++++-----
 lib/controller/handler.go                          |  2 -
 lib/dispatchcloud/worker/pool_test.go              |  1 +
 lib/dispatchcloud/worker/worker_test.go            |  1 +
 services/api/app/models/collection.rb              |  1 +
 services/api/app/models/container.rb               | 15 +++++--
 services/api/config/application.default.yml        |  4 ++
 .../20190214214814_add_container_lock_count.rb     |  5 +++
 services/api/db/structure.sql                      |  5 ++-
 .../arvados/v1/collections_controller_test.rb      | 25 +++++++++++-
 services/api/test/unit/container_test.rb           | 46 ++++++++++++++++++++++
 11 files changed, 111 insertions(+), 18 deletions(-)
 create mode 100644 services/api/db/migrate/20190214214814_add_container_lock_count.rb

       via  d97388bdbfeb6a43cb86996012a1db0ba4a8871f (commit)
       via  f2e8b80d3a3e98417e4e56f7069176a9b88eacbc (commit)
       via  9acc7690b9c734b7e31476ce66ef668bf7eb4bbf (commit)
       via  c1e1a754670eadb154fba29817dcd9b7360a4e18 (commit)
       via  8be73cb77f5f32d99f8448a66601e802714225da (commit)
       via  a4efc2178e0e59c4b32451365691e9100ff88186 (commit)
       via  5f8001297500ccd0a2153ede4a28ba14daad0d42 (commit)
       via  0f14b3456d2d3bdf95b78b65a1a41280a7416928 (commit)
       via  9fa65d7621853b24b7fb13acd44fedb28543b261 (commit)
      from  6d852fc2b60e140decfafc92a971a5d1f027e854 (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 d97388bdbfeb6a43cb86996012a1db0ba4a8871f
Merge: f2e8b80d3 9acc7690b
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date:   Wed Feb 20 11:49:18 2019 -0500

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


commit f2e8b80d3a3e98417e4e56f7069176a9b88eacbc
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date:   Wed Feb 20 11:48:25 2019 -0500

    14807: Fix missing import.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>

diff --git a/lib/dispatchcloud/worker/pool_test.go b/lib/dispatchcloud/worker/pool_test.go
index ffb7ab391..da9e650b8 100644
--- a/lib/dispatchcloud/worker/pool_test.go
+++ b/lib/dispatchcloud/worker/pool_test.go
@@ -12,6 +12,7 @@ import (
 	"git.curoverse.com/arvados.git/lib/cloud"
 	"git.curoverse.com/arvados.git/lib/dispatchcloud/test"
 	"git.curoverse.com/arvados.git/sdk/go/arvados"
+	"git.curoverse.com/arvados.git/sdk/go/ctxlog"
 	"github.com/prometheus/client_golang/prometheus"
 	check "gopkg.in/check.v1"
 )
diff --git a/lib/dispatchcloud/worker/worker_test.go b/lib/dispatchcloud/worker/worker_test.go
index 65e093530..3bc33b62c 100644
--- a/lib/dispatchcloud/worker/worker_test.go
+++ b/lib/dispatchcloud/worker/worker_test.go
@@ -12,6 +12,7 @@ import (
 	"git.curoverse.com/arvados.git/lib/cloud"
 	"git.curoverse.com/arvados.git/lib/dispatchcloud/test"
 	"git.curoverse.com/arvados.git/sdk/go/arvados"
+	"git.curoverse.com/arvados.git/sdk/go/ctxlog"
 	check "gopkg.in/check.v1"
 )
 

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


hooks/post-receive
--