Code

avoid a nil pointer dereference#2281

Code

Merged

dadgar merged 2 commits intohashicorp:masterhashicorp/nomad:masterfrom dbresson:fix-reserved-merge-errordbresson/nomad:fix-reserved-merge-errorCopy head branch name to clipboardFeb 3, 2017

+24-5

Commits

Commits on Feb 3, 2017

• extend config merge test to test merging to empty config

  

  David Bresson

  committed
  1a6c67d

• avoid nil pointer dereference

  

  David Bresson

  committed
  a49759f