From: Tom Clegg <tclegg@veritasgenetics.com>
Date: Mon, 12 Feb 2018 02:24:48 +0000 (-0500)
Subject: Merge branch '12991-docker-memory-limit'
X-Git-Tag: 1.1.4~87
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/f309b872cc064141d9fbf43a15067998603e2204

Merge branch '12991-docker-memory-limit'

fixes #12991

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg@veritasgenetics.com>
---

f309b872cc064141d9fbf43a15067998603e2204