Merge pull request #383 from hashicorp/f-driver-restructure

Move the executor and spawn package into driver
hashicorp · Nov 5, 2015 · b0464a5 · b0464a5
2 parents 64be746 + 0f1050b
commit b0464a5
Show file tree

Hide file tree

Showing 13 changed files with 3 additions and 3 deletions.
diff --git a/client/driver/exec.go b/client/driver/exec.go
@@ -12,7 +12,7 @@ import (
 	"github.com/hashicorp/go-getter"
 	"github.com/hashicorp/nomad/client/allocdir"
 	"github.com/hashicorp/nomad/client/config"
-	"github.com/hashicorp/nomad/client/executor"
+	"github.com/hashicorp/nomad/client/driver/executor"
 	"github.com/hashicorp/nomad/nomad/structs"
 )
 

diff --git a/client/executor/exec.go → client/driver/executor/exec.go b/client/executor/exec.go → client/driver/executor/exec.go
diff --git a/client/executor/exec_basic.go → client/driver/executor/exec_basic.go b/client/executor/exec_basic.go → client/driver/executor/exec_basic.go
diff --git a/client/executor/exec_linux.go → client/driver/executor/exec_linux.go b/client/executor/exec_linux.go → client/driver/executor/exec_linux.go
@@ -15,7 +15,7 @@ import (
 	"github.com/hashicorp/nomad/client/allocdir"
 	"github.com/hashicorp/nomad/client/driver/args"
 	"github.com/hashicorp/nomad/client/driver/environment"
-	"github.com/hashicorp/nomad/client/spawn"
+	"github.com/hashicorp/nomad/client/driver/spawn"
 	"github.com/hashicorp/nomad/nomad/structs"
 
 	"github.com/opencontainers/runc/libcontainer/cgroups"

diff --git a/client/executor/exec_linux_test.go → client/driver/executor/exec_linux_test.go b/client/executor/exec_linux_test.go → client/driver/executor/exec_linux_test.go
diff --git a/client/executor/exec_universal.go → client/driver/executor/exec_universal.go b/client/executor/exec_universal.go → client/driver/executor/exec_universal.go
diff --git a/client/executor/setuid.go → client/driver/executor/setuid.go b/client/executor/setuid.go → client/driver/executor/setuid.go
diff --git a/client/executor/setuid_windows.go → client/driver/executor/setuid_windows.go b/client/executor/setuid_windows.go → client/driver/executor/setuid_windows.go
diff --git a/client/driver/java.go b/client/driver/java.go
@@ -14,7 +14,7 @@ import (
 	"github.com/hashicorp/go-getter"
 	"github.com/hashicorp/nomad/client/allocdir"
 	"github.com/hashicorp/nomad/client/config"
-	"github.com/hashicorp/nomad/client/executor"
+	"github.com/hashicorp/nomad/client/driver/executor"
 	"github.com/hashicorp/nomad/nomad/structs"
 )
 

diff --git a/client/spawn/spawn.go → client/driver/spawn/spawn.go b/client/spawn/spawn.go → client/driver/spawn/spawn.go
diff --git a/client/spawn/spawn_posix.go → client/driver/spawn/spawn_posix.go b/client/spawn/spawn_posix.go → client/driver/spawn/spawn_posix.go
diff --git a/client/spawn/spawn_test.go → client/driver/spawn/spawn_test.go b/client/spawn/spawn_test.go → client/driver/spawn/spawn_test.go
diff --git a/client/spawn/spawn_windows.go → client/driver/spawn/spawn_windows.go b/client/spawn/spawn_windows.go → client/driver/spawn/spawn_windows.go