Merge branch '15942-cancel-unsatisfiable'
authorTom Clegg <tom@tomclegg.ca>
Sat, 21 Dec 2019 22:12:38 +0000 (17:12 -0500)
committerTom Clegg <tom@tomclegg.ca>
Sat, 21 Dec 2019 22:12:38 +0000 (17:12 -0500)
commit1080a6b87b423f152cbad55fa5a338d06afc8a12
tree95e1f11631fbb6991bad8fb43c2412585cdbe026
parentcf43300efe23a334136fef301a566ce8297f88c2
parentd01a136c64bb5e342542b7de4da45e09e0961dc1
Merge branch '15942-cancel-unsatisfiable'

refs #15942

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@tomclegg.ca>