12055: Merge branch 'master' into 12055-nodemanager-ec2-tags
authorLucas Di Pentima <ldipentima@veritasgenetics.com>
Wed, 16 Aug 2017 15:20:38 +0000 (12:20 -0300)
committerLucas Di Pentima <ldipentima@veritasgenetics.com>
Wed, 16 Aug 2017 15:20:38 +0000 (12:20 -0300)
commit74e03b2190fea52b3ea5800c50eca55b6e50b220
treefca0c810001e74e9751ebd1a5b67bf1378a3ff2a
parentf5f91a293a757ebccb74212856524c3823af812a
parent78f9bd9ee7166139483991f5e1517fa49f310ac2
12055: Merge branch 'master' into 12055-nodemanager-ec2-tags

Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <ldipentima@veritasgenetics.com>