Merge pull request #751 from hashicorp/f-consulapi

Switch to github.com/hashicorp/consul/api

builtin/providers/consul/config.go

@@ -3,7 +3,7 @@ package consul
 import (
 	"log"
 
-	"github.com/armon/consul-api"
+	consulapi "github.com/hashicorp/consul/api"
 )
 
 type Config struct {

builtin/providers/consul/resource_consul_keys.go

@@ -6,7 +6,7 @@ import (
 	"log"
 	"strconv"
 
-	"github.com/armon/consul-api"
+	consulapi "github.com/hashicorp/consul/api"
 	"github.com/hashicorp/terraform/helper/hashcode"
 	"github.com/hashicorp/terraform/helper/schema"
 )

builtin/providers/consul/resource_consul_keys_test.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/armon/consul-api"
+	consulapi "github.com/hashicorp/consul/api"
 	"github.com/hashicorp/terraform/helper/resource"
 	"github.com/hashicorp/terraform/terraform"
 )

builtin/providers/consul/resource_provider_test.go

@@ -3,7 +3,7 @@ package consul
 import (
 	"testing"
 
-	"github.com/armon/consul-api"
+	consulapi "github.com/hashicorp/consul/api"
 	"github.com/hashicorp/terraform/config"
 	"github.com/hashicorp/terraform/helper/schema"
 	"github.com/hashicorp/terraform/terraform"

remote/consul.go

@@ -4,7 +4,7 @@ import (
 	"crypto/md5"
 	"fmt"
 
-	"github.com/armon/consul-api"
+	consulapi "github.com/hashicorp/consul/api"
 )
 
 // ConsulRemoteClient implements the RemoteClient interface

remote/consul_test.go

@@ -6,7 +6,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/armon/consul-api"
+	consulapi "github.com/hashicorp/consul/api"
 	"github.com/hashicorp/terraform/terraform"
 )