Skip to content

Commit f4ef8a4

Browse files
committed
[core] Correct version of protobuf package
1 parent a5bd2ac commit f4ef8a4

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

core/integration/kafka/plugin.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,10 @@ import (
3939
"github.com/AliceO2Group/Control/core/integration"
4040
kafkapb "github.com/AliceO2Group/Control/core/integration/kafka/protos"
4141
"github.com/AliceO2Group/Control/core/workflow/callable"
42-
"github.com/golang/protobuf/proto"
4342
"github.com/segmentio/kafka-go"
4443
"github.com/sirupsen/logrus"
4544
"github.com/spf13/viper"
45+
"google.golang.org/protobuf/proto"
4646
)
4747

4848
var log = logger.New(logrus.StandardLogger(), "kafkaclient")

executor/executor.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ import (
4545
"github.com/AliceO2Group/Control/common/utils/uid"
4646
"github.com/AliceO2Group/Control/executor/executable"
4747
"github.com/AliceO2Group/Control/executor/executorutil"
48-
"github.com/golang/protobuf/proto"
4948
"github.com/mesos/mesos-go/api/v1/lib"
5049
"github.com/mesos/mesos-go/api/v1/lib/backoff"
5150
"github.com/mesos/mesos-go/api/v1/lib/encoding/codecs"
@@ -57,6 +56,7 @@ import (
5756
"github.com/mesos/mesos-go/api/v1/lib/httpcli/httpexec"
5857
"github.com/pborman/uuid"
5958
"github.com/sirupsen/logrus"
59+
"google.golang.org/protobuf/proto"
6060
)
6161

6262
const (

0 commit comments

Comments
 (0)