VOL-1460 Updated core to use voltha-protos instead of local protos
Moved protos to python directory in order to maintain functionaly of containers built there.
Added capability to do local builds of protos
Added instructions on running dep ensure for getting protos.
Updated github.com/golang/protobuf version to v1.3.1
Change-Id: Ia6ef55f07f0d5dcb5b750d7c37b21b71db85bfc4
diff --git a/vendor/github.com/Shopify/sarama/acl_describe_response.go b/vendor/github.com/Shopify/sarama/acl_describe_response.go
index 5bc9497..db3a88c 100644
--- a/vendor/github.com/Shopify/sarama/acl_describe_response.go
+++ b/vendor/github.com/Shopify/sarama/acl_describe_response.go
@@ -3,6 +3,7 @@
import "time"
type DescribeAclsResponse struct {
+ Version int16
ThrottleTime time.Duration
Err KError
ErrMsg *string
@@ -22,7 +23,7 @@
}
for _, resourceAcl := range d.ResourceAcls {
- if err := resourceAcl.encode(pe); err != nil {
+ if err := resourceAcl.encode(pe, d.Version); err != nil {
return err
}
}
@@ -72,9 +73,14 @@
}
func (d *DescribeAclsResponse) version() int16 {
- return 0
+ return int16(d.Version)
}
func (d *DescribeAclsResponse) requiredVersion() KafkaVersion {
- return V0_11_0_0
+ switch d.Version {
+ case 1:
+ return V2_0_0_0
+ default:
+ return V0_11_0_0
+ }
}