merge

client/driver/executor/exec_basic.go

@@ -7,6 +7,7 @@ import (
 	"os"
 	"os/exec"
 	"path/filepath"
+	"runtime"
 	"strings"
 
 	"github.com/hashicorp/nomad/client/allocdir"
@@ -131,6 +132,10 @@ func (e *BasicExecutor) Shutdown() error {
 		return fmt.Errorf("Failed to find user processes %v: %v", e.spawn.UserPid, err)
 	}
 
+	if runtime.GOOS == "windows" {
+		return proc.Kill()
+	}
+
 	return proc.Signal(os.Interrupt)
 }