From 3cfb5b3b9d8ae59e182fa7e71732cf0ce339d90d Mon Sep 17 00:00:00 2001 From: Rickard Dybeck Date: Thu, 10 Mar 2016 09:18:38 +0100 Subject: [PATCH] Only use one protobuf library --- scheduler/match_test.go | 2 +- scheduler/reconcile.go | 2 +- scheduler/scheduler.go | 2 +- scheduler/scheduler_test.go | 2 +- scheduler/task.go | 2 +- scheduler/task_test.go | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/scheduler/match_test.go b/scheduler/match_test.go index 5f4932a..da1debe 100644 --- a/scheduler/match_test.go +++ b/scheduler/match_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/klarna/eremetic/types" - "github.com/gogo/protobuf/proto" + "github.com/golang/protobuf/proto" mesos "github.com/mesos/mesos-go/mesosproto" "github.com/mesos/mesos-go/mesosutil" . "github.com/smartystreets/goconvey/convey" diff --git a/scheduler/reconcile.go b/scheduler/reconcile.go index e092f50..5f75b03 100644 --- a/scheduler/reconcile.go +++ b/scheduler/reconcile.go @@ -4,7 +4,7 @@ import ( "time" "github.com/Sirupsen/logrus" - "github.com/gogo/protobuf/proto" + "github.com/golang/protobuf/proto" "github.com/klarna/eremetic/database" "github.com/klarna/eremetic/types" mesos "github.com/mesos/mesos-go/mesosproto" diff --git a/scheduler/scheduler.go b/scheduler/scheduler.go index 11b6e46..2ecea70 100644 --- a/scheduler/scheduler.go +++ b/scheduler/scheduler.go @@ -7,7 +7,7 @@ import ( "time" "github.com/Sirupsen/logrus" - "github.com/gogo/protobuf/proto" + "github.com/golang/protobuf/proto" mesos "github.com/mesos/mesos-go/mesosproto" sched "github.com/mesos/mesos-go/scheduler" "github.com/prometheus/client_golang/prometheus" diff --git a/scheduler/scheduler_test.go b/scheduler/scheduler_test.go index 82d2074..f3718e4 100644 --- a/scheduler/scheduler_test.go +++ b/scheduler/scheduler_test.go @@ -9,7 +9,7 @@ import ( "os" "testing" - "github.com/gogo/protobuf/proto" + "github.com/golang/protobuf/proto" "github.com/klarna/eremetic/database" "github.com/klarna/eremetic/types" mesos "github.com/mesos/mesos-go/mesosproto" diff --git a/scheduler/task.go b/scheduler/task.go index 5788ba2..62945ac 100644 --- a/scheduler/task.go +++ b/scheduler/task.go @@ -3,7 +3,7 @@ package scheduler import ( "strings" - "github.com/gogo/protobuf/proto" + "github.com/golang/protobuf/proto" "github.com/klarna/eremetic/types" mesos "github.com/mesos/mesos-go/mesosproto" "github.com/mesos/mesos-go/mesosutil" diff --git a/scheduler/task_test.go b/scheduler/task_test.go index aa4ca5b..bf65bc5 100644 --- a/scheduler/task_test.go +++ b/scheduler/task_test.go @@ -4,7 +4,7 @@ import ( "testing" "time" - "github.com/gogo/protobuf/proto" + "github.com/golang/protobuf/proto" "github.com/klarna/eremetic/types" mesos "github.com/mesos/mesos-go/mesosproto" . "github.com/smartystreets/goconvey/convey"