Merge branch 'master' into 13255-account-activation
authorPeter Amstutz <pamstutz@veritasgenetics.com>
Fri, 22 Jun 2018 20:20:42 +0000 (16:20 -0400)
committerPeter Amstutz <pamstutz@veritasgenetics.com>
Fri, 22 Jun 2018 20:35:59 +0000 (16:35 -0400)
commitebb7681e5cf4bc2825e8786ecda895e219158703
tree4954e94937818a82a56cd7fb5924d70370931187
parent6df0096f2b246959bb9449a0940e9c539bcc9100
parent4fdb030e1ad940215b75b4b8a8f7aca5635211e3
Merge branch 'master' into 13255-account-activation

Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz@veritasgenetics.com>