Code

net-next merge to master#8203

Code

Merged

schmichael merged 4 commits intomasterhashicorp/nomad:masterfrom next-2hashicorp/nomad:next-2Copy head branch name to clipboardJun 18, 2020

+4,518-456

Commits

Commits on Jun 18, 2020

• Task DNS Options (#7661)

  Show description for e9ff8a8
  

  3 peopleauthored and

  schmichael

  committed
  e9ff8a8

• CNI Implementation (#7518)

  

  nickethier

  authored and

  schmichael

  committed
  33ce12c

• deps: updated libnetwork dep

  Show description for affcc4d
  schmichael

  committed
  affcc4d

• fix test failures from rebase

  

  nickethier

  authored and

  schmichael

  committed
  af6aee3