upgrade github.com/gogo/protobuf/... to v1.3.1 (elastic#16138)

kvch · Feb 20, 2020 · 854dcf1 · 854dcf1
1 parent 335401c
commit 854dcf1
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 30 deletions.
diff --git a/dev-tools/packaging/templates/common/magefile.go.tmpl b/dev-tools/packaging/templates/common/magefile.go.tmpl
@@ -10,7 +10,7 @@ import (
 	"github.com/magefile/mage/mg"
 	"github.com/magefile/mage/sh"
 
-	devtools "github.com/elastic/beats/dev-tools/mage"
+	devtools "github.com/elastic/beats/v7/dev-tools/mage"
 )
 
 func init() {

diff --git a/x-pack/libbeat/autodiscover/providers/aws/ec2/ec2.go b/x-pack/libbeat/autodiscover/providers/aws/ec2/ec2.go
@@ -9,13 +9,13 @@ import (
 	"github.com/pkg/errors"
 
 <<<<<<< HEAD
+	"github.com/elastic/beats/v7/v7/libbeat/common"
+	"github.com/elastic/beats/v7/v7/libbeat/logp"
+	awsauto "github.com/elastic/beats/v7/v7/x-pack/libbeat/autodiscover/providers/aws"
+=======
 	"github.com/elastic/beats/v7/libbeat/common"
 	"github.com/elastic/beats/v7/libbeat/logp"
 	awsauto "github.com/elastic/beats/v7/x-pack/libbeat/autodiscover/providers/aws"
-=======
-	"github.com/elastic/beats/libbeat/common"
-	"github.com/elastic/beats/libbeat/logp"
-	awsauto "github.com/elastic/beats/x-pack/libbeat/autodiscover/providers/aws"
 >>>>>>> Add autodiscover for aws_ec2 (#14823)
 )
 

diff --git a/x-pack/libbeat/autodiscover/providers/aws/ec2/fetch.go b/x-pack/libbeat/autodiscover/providers/aws/ec2/fetch.go
@@ -13,11 +13,11 @@ import (
 	"go.uber.org/multierr"
 
 <<<<<<< HEAD
+	"github.com/elastic/beats/v7/v7/libbeat/logp"
+	awsauto "github.com/elastic/beats/v7/v7/x-pack/libbeat/autodiscover/providers/aws"
+=======
 	"github.com/elastic/beats/v7/libbeat/logp"
 	awsauto "github.com/elastic/beats/v7/x-pack/libbeat/autodiscover/providers/aws"
-=======
-	"github.com/elastic/beats/libbeat/logp"
-	awsauto "github.com/elastic/beats/x-pack/libbeat/autodiscover/providers/aws"
 >>>>>>> Add autodiscover for aws_ec2 (#14823)
 )
 

diff --git a/x-pack/libbeat/autodiscover/providers/aws/ec2/provider.go b/x-pack/libbeat/autodiscover/providers/aws/ec2/provider.go
@@ -11,6 +11,15 @@ import (
 	"github.com/pkg/errors"
 
 <<<<<<< HEAD
+	"github.com/elastic/beats/v7/v7/libbeat/autodiscover"
+	"github.com/elastic/beats/v7/v7/libbeat/autodiscover/template"
+	"github.com/elastic/beats/v7/v7/libbeat/common"
+	"github.com/elastic/beats/v7/v7/libbeat/common/bus"
+	"github.com/elastic/beats/v7/v7/libbeat/common/cfgwarn"
+	"github.com/elastic/beats/v7/v7/libbeat/logp"
+	awsauto "github.com/elastic/beats/v7/v7/x-pack/libbeat/autodiscover/providers/aws"
+	awscommon "github.com/elastic/beats/v7/v7/x-pack/libbeat/common/aws"
+=======
 	"github.com/elastic/beats/v7/libbeat/autodiscover"
 	"github.com/elastic/beats/v7/libbeat/autodiscover/template"
 	"github.com/elastic/beats/v7/libbeat/common"
@@ -19,15 +28,6 @@ import (
 	"github.com/elastic/beats/v7/libbeat/logp"
 	awsauto "github.com/elastic/beats/v7/x-pack/libbeat/autodiscover/providers/aws"
 	awscommon "github.com/elastic/beats/v7/x-pack/libbeat/common/aws"
-=======
-	"github.com/elastic/beats/libbeat/autodiscover"
-	"github.com/elastic/beats/libbeat/autodiscover/template"
-	"github.com/elastic/beats/libbeat/common"
-	"github.com/elastic/beats/libbeat/common/bus"
-	"github.com/elastic/beats/libbeat/common/cfgwarn"
-	"github.com/elastic/beats/libbeat/logp"
-	awsauto "github.com/elastic/beats/x-pack/libbeat/autodiscover/providers/aws"
-	awscommon "github.com/elastic/beats/x-pack/libbeat/common/aws"
 >>>>>>> Add autodiscover for aws_ec2 (#14823)
 )
 

diff --git a/x-pack/libbeat/autodiscover/providers/aws/ec2/provider_test.go b/x-pack/libbeat/autodiscover/providers/aws/ec2/provider_test.go
@@ -10,23 +10,23 @@ import (
 
 <<<<<<< HEAD
 =======
-	"github.com/elastic/beats/libbeat/common"
-	"github.com/elastic/beats/libbeat/common/bus"
-	"github.com/elastic/beats/libbeat/logp"
-	awsauto "github.com/elastic/beats/x-pack/libbeat/autodiscover/providers/aws"
-	"github.com/elastic/beats/x-pack/libbeat/autodiscover/providers/aws/test"
+	"github.com/elastic/beats/v7/libbeat/common"
+	"github.com/elastic/beats/v7/libbeat/common/bus"
+	"github.com/elastic/beats/v7/libbeat/logp"
+	awsauto "github.com/elastic/beats/v7/x-pack/libbeat/autodiscover/providers/aws"
+	"github.com/elastic/beats/v7/x-pack/libbeat/autodiscover/providers/aws/test"
 >>>>>>> Add autodiscover for aws_ec2 (#14823)
 	"github.com/gofrs/uuid"
 	"github.com/pkg/errors"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 <<<<<<< HEAD
 
-	"github.com/elastic/beats/v7/libbeat/common"
-	"github.com/elastic/beats/v7/libbeat/common/bus"
-	"github.com/elastic/beats/v7/libbeat/logp"
-	awsauto "github.com/elastic/beats/v7/x-pack/libbeat/autodiscover/providers/aws"
-	"github.com/elastic/beats/v7/x-pack/libbeat/autodiscover/providers/aws/test"
+	"github.com/elastic/beats/v7/v7/libbeat/common"
+	"github.com/elastic/beats/v7/v7/libbeat/common/bus"
+	"github.com/elastic/beats/v7/v7/libbeat/logp"
+	awsauto "github.com/elastic/beats/v7/v7/x-pack/libbeat/autodiscover/providers/aws"
+	"github.com/elastic/beats/v7/v7/x-pack/libbeat/autodiscover/providers/aws/test"
 =======
 >>>>>>> Add autodiscover for aws_ec2 (#14823)
 )

diff --git a/x-pack/libbeat/autodiscover/providers/aws/ec2/watch.go b/x-pack/libbeat/autodiscover/providers/aws/ec2/watch.go
@@ -11,11 +11,11 @@ import (
 	"github.com/pkg/errors"
 
 <<<<<<< HEAD
+	"github.com/elastic/beats/v7/v7/libbeat/logp"
+	awsauto "github.com/elastic/beats/v7/v7/x-pack/libbeat/autodiscover/providers/aws"
+=======
 	"github.com/elastic/beats/v7/libbeat/logp"
 	awsauto "github.com/elastic/beats/v7/x-pack/libbeat/autodiscover/providers/aws"
-=======
-	"github.com/elastic/beats/libbeat/logp"
-	awsauto "github.com/elastic/beats/x-pack/libbeat/autodiscover/providers/aws"
 >>>>>>> Add autodiscover for aws_ec2 (#14823)
 )