cleanup imports and rebase artifacts

builder/lxc/builder.go

@@ -1,7 +1,6 @@
 package lxc
 
 import (
-	"errors"
 	"github.com/hashicorp/packer/common"
 	"github.com/hashicorp/packer/packer"
 	"github.com/hashicorp/packer/template/interpolate"

builder/lxc/builder_test.go

@@ -4,7 +4,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 func testConfig() map[string]interface{} {

builder/lxc/communicator.go

@@ -2,7 +2,7 @@ package lxc
 
 import (
 	"fmt"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"io"
 	"io/ioutil"
 	"log"

builder/lxc/communicator_test.go

@@ -1,7 +1,7 @@
 package lxc
 
 import (
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"testing"
 )
 

builder/lxc/config.go

@@ -2,11 +2,11 @@ package lxc
 
 import (
 	"fmt"
+	"github.com/hashicorp/packer/common"
+	"github.com/hashicorp/packer/helper/config"
+	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/template/interpolate"
 	"github.com/mitchellh/mapstructure"
-	"github.com/mitchellh/packer/common"
-	"github.com/mitchellh/packer/helper/config"
-	"github.com/mitchellh/packer/packer"
-	"github.com/mitchellh/packer/template/interpolate"
 	"os"
 	"time"
 )

builder/lxc/step_export.go

@@ -3,8 +3,8 @@ package lxc
 import (
 	"bytes"
 	"fmt"
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 	"io"
 	"log"
 	"os"

builder/lxc/step_lxc_create.go

@@ -3,8 +3,8 @@ package lxc
 import (
 	"bytes"
 	"fmt"
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 	"log"
 	"os/exec"
 	"path/filepath"

builder/lxc/step_prepare_output_dir.go

@@ -1,8 +1,8 @@
 package lxc
 
 import (
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 	"log"
 	"os"
 	"time"

builder/lxc/step_provision.go

@@ -1,8 +1,8 @@
 package lxc
 
 import (
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 	"log"
 )
 

builder/lxc/step_wait_init.go

@@ -3,8 +3,8 @@ package lxc
 import (
 	"errors"
 	"fmt"
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 	"log"
 	"strings"
 	"time"

command/plugin.go

@@ -27,7 +27,7 @@ import (
 	googlecomputebuilder "github.com/hashicorp/packer/builder/googlecompute"
 	hypervisobuilder "github.com/hashicorp/packer/builder/hyperv/iso"
 	lxcbuilder "github.com/hashicorp/packer/builder/lxc"
-	lxdbuilder "github.com/hashicorp/packer/builder/lxd"	
+	lxdbuilder "github.com/hashicorp/packer/builder/lxd"
 	nullbuilder "github.com/hashicorp/packer/builder/null"
 	oneandonebuilder "github.com/hashicorp/packer/builder/oneandone"
 	openstackbuilder "github.com/hashicorp/packer/builder/openstack"
@@ -78,7 +78,6 @@ type PluginCommand struct {
 }
 
 var Builders = map[string]packer.Builder{
-<<<<<<< HEAD
 	"alicloud-ecs":        new(alicloudecsbuilder.Builder),
 	"amazon-chroot":       new(amazonchrootbuilder.Builder),
 	"amazon-ebs":          new(amazonebsbuilder.Builder),