Merge fix

This commit is contained in:
Alex Dadgar
2015-11-05 13:46:02 -08:00
parent c7718e6628
commit 5b067a3e4f
17 changed files with 48 additions and 6 deletions

View File

@@ -13,6 +13,7 @@ import (
"github.com/hashicorp/nomad/client/allocdir"
"github.com/hashicorp/nomad/client/config"
"github.com/hashicorp/nomad/client/driver/executor"
"github.com/hashicorp/nomad/client/fingerprint"
"github.com/hashicorp/nomad/client/getter"
"github.com/hashicorp/nomad/nomad/structs"
)
@@ -21,6 +22,7 @@ import (
// It literally just fork/execs tasks with the java command.
type JavaDriver struct {
DriverContext
fingerprint.StaticFingerprinter
}
// javaHandle is returned from Start/Open as a handle to the PID
@@ -32,7 +34,7 @@ type javaHandle struct {
// NewJavaDriver is used to create a new exec driver
func NewJavaDriver(ctx *DriverContext) Driver {
return &JavaDriver{*ctx}
return &JavaDriver{DriverContext: *ctx}
}
func (d *JavaDriver) Fingerprint(cfg *config.Config, node *structs.Node) (bool, error) {