From cbdc8f4c3265ec1531e37030e25773e45f2e5d6d Mon Sep 17 00:00:00 2001
From: Danielle Tomlinson <dani@hashicorp.com>
Date: Tue, 11 Dec 2018 15:46:58 +0100
Subject: [PATCH] client: Correctly pass a noop PrevAllocMigrator when
 restoring

---
 client/client.go | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/client/client.go b/client/client.go
index eed0a8373..f3565727b 100644
--- a/client/client.go
+++ b/client/client.go
@@ -861,6 +861,7 @@ func (c *Client) restoreState() error {
 		//    we need the local AllocRunners initialized first. We could
 		//    add a second loop to initialize just the alloc watcher.
 		prevAllocWatcher := allocwatcher.NoopPrevAlloc{}
+		prevAllocMigrator := allocwatcher.NoopPrevAlloc{}
 
 		c.configLock.RLock()
 		arConf := &allocrunner.Config{
@@ -873,6 +874,7 @@ func (c *Client) restoreState() error {
 			Consul:                c.consulService,
 			Vault:                 c.vaultClient,
 			PrevAllocWatcher:      prevAllocWatcher,
+			PrevAllocMigrator:     prevAllocMigrator,
 			PluginLoader:          c.config.PluginLoader,
 			PluginSingletonLoader: c.config.PluginSingletonLoader,
 			DeviceManager:         c.devicemanager,