From: Lucas Di Pentima <lucas@di-pentima.com.ar>
Date: Mon, 20 Apr 2020 16:46:51 +0000 (-0300)
Subject: Merge branch 'dantetwc-master'. Closes #16340
X-Git-Tag: 2.1.0~246
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/3cd04aa065b327d7aeccd296b1cd7703cc4034c2?hp=58c540490bbf361f434f87c0367d941156f36c19

Merge branch 'dantetwc-master'. Closes #16340

Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <lucas@di-pentima.com.ar>
---

diff --git a/AUTHORS b/AUTHORS
index 436a504c36..93bdb37dc8 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -19,3 +19,5 @@ Thomas Mooney <tmooney@genome.wustl.edu>
 Chen Chen <aflyhorse@gmail.com>
 Veritas Genetics, Inc. <*@veritasgenetics.com>
 Curii Corporation, Inc. <*@curii.com>
+Dante Tsang <dante@dantetsang.com>
+Codex Genetics Ltd <info@codexgenetics.com>
\ No newline at end of file
diff --git a/lib/dispatchcloud/container/queue.go b/lib/dispatchcloud/container/queue.go
index d128c265f8..45b346383f 100644
--- a/lib/dispatchcloud/container/queue.go
+++ b/lib/dispatchcloud/container/queue.go
@@ -382,7 +382,7 @@ func (cq *Queue) poll() (map[string]*arvados.Container, error) {
 			*next[upd.UUID] = upd
 		}
 	}
-	selectParam := []string{"uuid", "state", "priority", "runtime_constraints", "container_image", "mounts"}
+	selectParam := []string{"uuid", "state", "priority", "runtime_constraints", "container_image", "mounts", "scheduling_parameters"}
 	limitParam := 1000
 
 	mine, err := cq.fetchAll(arvados.ResourceListParams{