diff --git a/CHANGELOG.md b/CHANGELOG.md index 55ff251c6d6..b13a9fa775a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -40,6 +40,7 @@ BUG FIXES: the client [GH-1641] * discovery/jobspec: Validate service name after interpolation [GH-1852] * driver/docker: Fix `local/` directory mount into container [GH-1830] + * jobspec: Tasks without a resource block no longer fail to validate [GH-1864] ## 0.4.1 (August 18, 2016) diff --git a/nomad/structs/structs.go b/nomad/structs/structs.go index bbd7cac6b17..eab9d0c9f68 100644 --- a/nomad/structs/structs.go +++ b/nomad/structs/structs.go @@ -2103,6 +2103,7 @@ func (t *Task) Canonicalize(job *Job, tg *TaskGroup) { service.Canonicalize(job.Name, tg.Name, t.Name) } + // If Resources are nil initialize them to defaults, otherwise canonicalize if t.Resources == nil { t.Resources = DefaultResources() } else {