Fixed merge conflicts

This commit is contained in:
Diptanu Choudhury
2016-03-24 15:09:50 -07:00
8 changed files with 31 additions and 21 deletions

View File

@@ -202,7 +202,7 @@ func (d *JavaDriver) Start(ctx *ExecContext, task *structs.Task) (DriverHandle,
waitCh: make(chan *cstructs.WaitResult, 1),
}
if err := h.executor.RegisterServices(); err != nil {
d.logger.Printf("[ERR] driver.java: error registering services with consul for task: %v", task)
d.logger.Printf("[ERR] driver.java: error registering services with consul for task: %q: %v", task.Name, err)
}
go h.run()
return h, nil