Merge branch 'master' into 11850-singlecontainer-max-requirements
authorjiayong2 <jiayong@math.mit.edu>
Thu, 1 Feb 2018 21:07:04 +0000 (21:07 +0000)
committerjiayong2 <jiayong@math.mit.edu>
Thu, 1 Feb 2018 21:07:04 +0000 (21:07 +0000)
commit54e5ad11af9ee6804c908e49249edf87de7b35dd
tree8a363360765db85daf2e86940b8616a815a15479
parent4d4462189a59d9e27e692fc6f84c4f93fa59741d
parentb3e8a483835334becbef9cba2bebbcf08df47c15
Merge branch 'master' into 11850-singlecontainer-max-requirements

Arvados-DCO-1.1-Signed-off-by: Jiayong Li <jiayong@math.mit.edu>