Fix code copied from gogo using a different proto import (#9009)

hashicorp · May 15, 2020 · 97f0d0b · 97f0d0b
1 parent 0874e27
commit 97f0d0b
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/physical/raft/fsm.go b/physical/raft/fsm.go
@@ -15,7 +15,7 @@ import (
 	"time"
 
 	metrics "github.com/armon/go-metrics"
-	proto "github.com/golang/protobuf/proto"
+	"github.com/golang/protobuf/proto"
 	"github.com/hashicorp/errwrap"
 	log "github.com/hashicorp/go-hclog"
 	"github.com/hashicorp/go-raftchunking"

diff --git a/physical/raft/io.go b/physical/raft/io.go
@@ -31,7 +31,7 @@ package raft
 import (
 	"io"
 
-	"google.golang.org/protobuf/proto"
+	"github.com/golang/protobuf/proto"
 )
 
 type Writer interface {

diff --git a/physical/raft/varint.go b/physical/raft/varint.go
@@ -34,7 +34,7 @@ import (
 	"errors"
 	"io"
 
-	"google.golang.org/protobuf/proto"
+	"github.com/golang/protobuf/proto"
 )
 
 var (
-Original file line number
+Diff line change
@@ Expand Up / @@ -34,7 +34,7 @@ import ( @@
     	"errors"
     	"io"
-    	"google.golang.org/protobuf/proto"
+    	"github.com/golang/protobuf/proto"
     )
     var (
@@ Expand Down @@