merge master #6

Closed
vtolstov wants to merge 24 commits from master into v3
6 changed files with 6 additions and 6 deletions
Showing only changes of commit 6c0e4d74b9 - Show all commits

View File

@ -91,7 +91,7 @@ var file_codec_frame_proto_rawDesc = []byte{
0x0b, 0x6d, 0x69, 0x63, 0x72, 0x6f, 0x2e, 0x63, 0x6f, 0x64, 0x65, 0x63, 0x42, 0x0a, 0x4d, 0x69, 0x0b, 0x6d, 0x69, 0x63, 0x72, 0x6f, 0x2e, 0x63, 0x6f, 0x64, 0x65, 0x63, 0x42, 0x0a, 0x4d, 0x69,
0x63, 0x72, 0x6f, 0x43, 0x6f, 0x64, 0x65, 0x63, 0x50, 0x01, 0x5a, 0x2a, 0x67, 0x6f, 0x2e, 0x75, 0x63, 0x72, 0x6f, 0x43, 0x6f, 0x64, 0x65, 0x63, 0x50, 0x01, 0x5a, 0x2a, 0x67, 0x6f, 0x2e, 0x75,
0x6e, 0x69, 0x73, 0x74, 0x61, 0x63, 0x6b, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x6d, 0x69, 0x63, 0x72, 0x6e, 0x69, 0x73, 0x74, 0x61, 0x63, 0x6b, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x6d, 0x69, 0x63, 0x72,
0x6f, 0x2d, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x64, 0x65, 0x63, 0x6f, 0x2d, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x64, 0x65, 0x63,
0x3b, 0x63, 0x6f, 0x64, 0x65, 0x63, 0xf8, 0x01, 0x01, 0xa2, 0x02, 0x06, 0x4d, 0x43, 0x4f, 0x44, 0x3b, 0x63, 0x6f, 0x64, 0x65, 0x63, 0xf8, 0x01, 0x01, 0xa2, 0x02, 0x06, 0x4d, 0x43, 0x4f, 0x44,
0x45, 0x43, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, 0x45, 0x43, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
} }

View File

@ -17,7 +17,7 @@ syntax = "proto3";
package micro.codec; package micro.codec;
option cc_enable_arenas = true; option cc_enable_arenas = true;
option go_package = "go.unistack.org/micro-proto/v3/codec;codec"; option go_package = "go.unistack.org/micro-proto/v4/codec;codec";
option java_multiple_files = true; option java_multiple_files = true;
option java_outer_classname = "MicroCodec"; option java_outer_classname = "MicroCodec";
option java_package = "micro.codec"; option java_package = "micro.codec";

View File

@ -119,7 +119,7 @@ var file_errors_errors_proto_rawDesc = []byte{
0x42, 0x58, 0x0a, 0x0c, 0x6d, 0x69, 0x63, 0x72, 0x6f, 0x2e, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x73, 0x42, 0x58, 0x0a, 0x0c, 0x6d, 0x69, 0x63, 0x72, 0x6f, 0x2e, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x73,
0x42, 0x0b, 0x4d, 0x69, 0x63, 0x72, 0x6f, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x73, 0x50, 0x01, 0x5a, 0x42, 0x0b, 0x4d, 0x69, 0x63, 0x72, 0x6f, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x73, 0x50, 0x01, 0x5a,
0x2c, 0x67, 0x6f, 0x2e, 0x75, 0x6e, 0x69, 0x73, 0x74, 0x61, 0x63, 0x6b, 0x2e, 0x6f, 0x72, 0x67, 0x2c, 0x67, 0x6f, 0x2e, 0x75, 0x6e, 0x69, 0x73, 0x74, 0x61, 0x63, 0x6b, 0x2e, 0x6f, 0x72, 0x67,
0x2f, 0x6d, 0x69, 0x63, 0x72, 0x6f, 0x2d, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x76, 0x33, 0x2f, 0x2f, 0x6d, 0x69, 0x63, 0x72, 0x6f, 0x2d, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x76, 0x34, 0x2f,
0x65, 0x72, 0x72, 0x6f, 0x72, 0x73, 0x3b, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x73, 0xf8, 0x01, 0x01, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x73, 0x3b, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x73, 0xf8, 0x01, 0x01,
0xa2, 0x02, 0x07, 0x4d, 0x45, 0x52, 0x52, 0x4f, 0x52, 0x53, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0xa2, 0x02, 0x07, 0x4d, 0x45, 0x52, 0x52, 0x4f, 0x52, 0x53, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74,
0x6f, 0x33, 0x6f, 0x33,

View File

@ -17,7 +17,7 @@ syntax = "proto3";
package micro.errors; package micro.errors;
option cc_enable_arenas = true; option cc_enable_arenas = true;
option go_package = "go.unistack.org/micro-proto/v3/errors;errors"; option go_package = "go.unistack.org/micro-proto/v4/errors;errors";
option java_multiple_files = true; option java_multiple_files = true;
option java_outer_classname = "MicroErrors"; option java_outer_classname = "MicroErrors";
option java_package = "micro.errors"; option java_package = "micro.errors";

View File

@ -86,7 +86,7 @@ var file_tag_tag_proto_rawDesc = []byte{
0x73, 0x42, 0x4b, 0x0a, 0x09, 0x6d, 0x69, 0x63, 0x72, 0x6f, 0x2e, 0x74, 0x61, 0x67, 0x42, 0x0a, 0x73, 0x42, 0x4b, 0x0a, 0x09, 0x6d, 0x69, 0x63, 0x72, 0x6f, 0x2e, 0x74, 0x61, 0x67, 0x42, 0x0a,
0x4d, 0x69, 0x63, 0x72, 0x6f, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x26, 0x67, 0x6f, 0x4d, 0x69, 0x63, 0x72, 0x6f, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x26, 0x67, 0x6f,
0x2e, 0x75, 0x6e, 0x69, 0x73, 0x74, 0x61, 0x63, 0x6b, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x6d, 0x69, 0x2e, 0x75, 0x6e, 0x69, 0x73, 0x74, 0x61, 0x63, 0x6b, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x6d, 0x69,
0x63, 0x72, 0x6f, 0x2d, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x76, 0x33, 0x2f, 0x74, 0x61, 0x67, 0x63, 0x72, 0x6f, 0x2d, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x76, 0x34, 0x2f, 0x74, 0x61, 0x67,
0x3b, 0x74, 0x61, 0x67, 0xf8, 0x01, 0x01, 0xa2, 0x02, 0x04, 0x4d, 0x54, 0x41, 0x47, 0x62, 0x06, 0x3b, 0x74, 0x61, 0x67, 0xf8, 0x01, 0x01, 0xa2, 0x02, 0x04, 0x4d, 0x54, 0x41, 0x47, 0x62, 0x06,
0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
} }

View File

@ -19,7 +19,7 @@ package micro.tag;
import "google/protobuf/descriptor.proto"; import "google/protobuf/descriptor.proto";
option cc_enable_arenas = true; option cc_enable_arenas = true;
option go_package = "go.unistack.org/micro-proto/v3/tag;tag"; option go_package = "go.unistack.org/micro-proto/v4/tag;tag";
option java_multiple_files = true; option java_multiple_files = true;
option java_outer_classname = "MicroProto"; option java_outer_classname = "MicroProto";
option java_package = "micro.tag"; option java_package = "micro.tag";