resolve conflict

vmware · Mar 7, 2017 · 2303f95 · 2303f95
1 parent 2f32459
commit 2303f95
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/lib/migration/migrator_test.go b/lib/migration/migrator_test.go
@@ -36,7 +36,7 @@ func setUp() {
 	// register sample plugin into test
 	log.SetLevel(log.DebugLevel)
 	trace.Logger.Level = log.DebugLevel
-	version.MaxPluginVersion = 3
+	version.MaxPluginVersion = 4
 
 	if err := manager.Migrator.Register(version.MaxPluginVersion, manager.ApplianceConfigure, &plugin1.ApplianceStopSignalRename{}); err != nil {
 		log.Errorf("Failed to register plugin %s:%d, %s", manager.ApplianceConfigure, version.MaxPluginVersion, err)

diff --git a/lib/migration/plugins/init.go b/lib/migration/plugins/init.go
@@ -16,6 +16,6 @@ package plugins
 
 // import all plugin packages here to register plugins
 import (
-	_ "github.com/vmware/vic/pkg/version/plugin1"
 	_ "github.com/vmware/vic/pkg/version/plugin2"
+	_ "github.com/vmware/vic/pkg/version/plugin3"
 )
diff --git a/pkg/version/version.go b/pkg/version/version.go
@@ -31,7 +31,7 @@ var (
 	State       string
 
 	// MaxPluginVersion must be increased to add new plugin and make sure the new plugin version is same to this value
-	MaxPluginVersion = 2
+	MaxPluginVersion = 3
 
 	v bool
 )