Merge pull request #4756 from hashicorp/f-finalize-arv2

Deprecate allocrunner and promote allocrunnerv2 to allocrunner
hashicorp · Oct 5, 2018 · 7120fc2 · 7120fc2
2 parents 3f25ab4 + 47514ff
commit 7120fc2
Show file tree

Hide file tree

Showing 80 changed files with 5,690 additions and 5,641 deletions.
diff --git a/client/allocrunner/alloc_runner.go b/client/allocrunner/alloc_runner.go
diff --git a/client/allocrunnerv2/alloc_runner_hooks.go → client/allocrunner/alloc_runner_hooks.go b/client/allocrunnerv2/alloc_runner_hooks.go → client/allocrunner/alloc_runner_hooks.go
@@ -1,12 +1,12 @@
-package allocrunnerv2
+package allocrunner
 
 import (
 	"context"
 	"fmt"
 	"time"
 
 	multierror "github.com/hashicorp/go-multierror"
-	"github.com/hashicorp/nomad/client/allocrunnerv2/interfaces"
+	"github.com/hashicorp/nomad/client/allocrunner/interfaces"
 	"github.com/hashicorp/nomad/nomad/structs"
 )
 
@@ -76,7 +76,7 @@ func (ar *allocRunner) initRunnerHooks() {
 	hs := &allocHealthSetter{ar}
 
 	// Create the alloc directory hook. This is run first to ensure the
-	// directoy path exists for other hooks.
+	// directory path exists for other hooks.
 	ar.runnerHooks = []interfaces.RunnerHook{
 		newAllocDirHook(hookLogger, ar.allocDir),
 		newDiskMigrationHook(hookLogger, ar.prevAllocWatcher, ar.allocDir),