Commit 479f5796 authored by Jacob Vosmaer's avatar Jacob Vosmaer

Merge branch 'zj-fix-proto-import-path' into 'master'

Rename go package to gitalypb

See merge request gitlab-org/gitaly-proto!213
parents 506edfca c0491da8
......@@ -19,7 +19,7 @@ ENV['PATH'] = [
def main
FileUtils.rm(Dir['go/**/*.pb.go'])
run!(%W[protoc -I #{PROTO_INCLUDE}] + PROTO_FILES + %w[--go_out=plugins=grpc:go])
run!(%W[protoc -I #{PROTO_INCLUDE}] + PROTO_FILES + %w[--go_out=plugins=grpc:go/gitalypb])
FileUtils.rm(Dir[File.join(RUBY_PREFIX, '**/*_pb.rb')])
ruby_lib_gitaly = File.join(RUBY_PREFIX, 'gitaly')
......
......@@ -2,7 +2,7 @@
// source: blob.proto
/*
Package gitaly is a generated protocol buffer package.
Package gitalypb is a generated protocol buffer package.
It is generated from these files:
blob.proto
......@@ -299,7 +299,7 @@ It has these top-level messages:
WikiGetFormattedDataRequest
WikiGetFormattedDataResponse
*/
package gitaly
package gitalypb
import proto "github.com/golang/protobuf/proto"
import fmt "fmt"
......
// Code generated by protoc-gen-go. DO NOT EDIT.
// source: commit.proto
package gitaly
package gitalypb
import proto "github.com/golang/protobuf/proto"
import fmt "fmt"
......
// Code generated by protoc-gen-go. DO NOT EDIT.
// source: conflicts.proto
package gitaly
package gitalypb
import proto "github.com/golang/protobuf/proto"
import fmt "fmt"
......
// Code generated by protoc-gen-go. DO NOT EDIT.
// source: deprecated-services.proto
package gitaly
package gitalypb
import proto "github.com/golang/protobuf/proto"
import fmt "fmt"
......
// Code generated by protoc-gen-go. DO NOT EDIT.
// source: diff.proto
package gitaly
package gitalypb
import proto "github.com/golang/protobuf/proto"
import fmt "fmt"
......
// Code generated by protoc-gen-go. DO NOT EDIT.
// source: namespace.proto
package gitaly
package gitalypb
import proto "github.com/golang/protobuf/proto"
import fmt "fmt"
......
// Code generated by protoc-gen-go. DO NOT EDIT.
// source: notifications.proto
package gitaly
package gitalypb
import proto "github.com/golang/protobuf/proto"
import fmt "fmt"
......
// Code generated by protoc-gen-go. DO NOT EDIT.
// source: operations.proto
package gitaly
package gitalypb
import proto "github.com/golang/protobuf/proto"
import fmt "fmt"
......
// Code generated by protoc-gen-go. DO NOT EDIT.
// source: ref.proto
package gitaly
package gitalypb
import proto "github.com/golang/protobuf/proto"
import fmt "fmt"
......
// Code generated by protoc-gen-go. DO NOT EDIT.
// source: remote.proto
package gitaly
package gitalypb
import proto "github.com/golang/protobuf/proto"
import fmt "fmt"
......
// Code generated by protoc-gen-go. DO NOT EDIT.
// source: repository-service.proto
package gitaly
package gitalypb
import proto "github.com/golang/protobuf/proto"
import fmt "fmt"
......
// Code generated by protoc-gen-go. DO NOT EDIT.
// source: server.proto
package gitaly
package gitalypb
import proto "github.com/golang/protobuf/proto"
import fmt "fmt"
......
// Code generated by protoc-gen-go. DO NOT EDIT.
// source: shared.proto
package gitaly
package gitalypb
import proto "github.com/golang/protobuf/proto"
import fmt "fmt"
......@@ -320,41 +320,41 @@ func init() {
func init() { proto.RegisterFile("shared.proto", fileDescriptor12) }
var fileDescriptor12 = []byte{
// 568 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x53, 0x5f, 0x6f, 0xd3, 0x3e,
0x14, 0x55, 0xd2, 0xb4, 0x5b, 0x6f, 0xb3, 0x9f, 0x7e, 0x98, 0x3d, 0x44, 0x43, 0xd3, 0x4a, 0x78,
0xd9, 0x03, 0xca, 0x50, 0x91, 0x78, 0x1f, 0x7f, 0x34, 0x8d, 0x07, 0x40, 0xde, 0xf6, 0x1c, 0xb9,
0xcd, 0x9d, 0x6b, 0xe4, 0x34, 0x95, 0x7d, 0x33, 0xb1, 0x3d, 0xf1, 0x01, 0xf9, 0x1e, 0x7c, 0x0d,
0x64, 0x3b, 0xe9, 0x06, 0x14, 0xc4, 0x9b, 0xef, 0xf1, 0xf1, 0xf5, 0x3d, 0x3e, 0xc7, 0x90, 0xda,
0xa5, 0x30, 0x58, 0x15, 0x6b, 0xd3, 0x50, 0xc3, 0x46, 0x52, 0x91, 0xd0, 0xb7, 0x07, 0x47, 0xb2,
0x69, 0xa4, 0xc6, 0x13, 0x8f, 0xce, 0xdb, 0xeb, 0x13, 0x52, 0x35, 0x5a, 0x12, 0xf5, 0x3a, 0x10,
0xf3, 0xaf, 0x31, 0x00, 0xc7, 0x75, 0x63, 0x15, 0x35, 0xe6, 0x96, 0x3d, 0x85, 0xd4, 0x52, 0x63,
0x84, 0xc4, 0x72, 0x25, 0x6a, 0xcc, 0xe2, 0x69, 0x74, 0x3c, 0xe6, 0x93, 0x0e, 0xfb, 0x20, 0x6a,
0x64, 0xcf, 0x60, 0xcf, 0xa0, 0x16, 0xa4, 0x6e, 0xb0, 0x5c, 0x0b, 0x5a, 0x66, 0x03, 0xcf, 0x49,
0x7b, 0xf0, 0x93, 0xa0, 0x25, 0x7b, 0x01, 0xfb, 0x52, 0x51, 0xd9, 0xcc, 0x3f, 0xe3, 0x82, 0xca,
0x4a, 0x19, 0x5c, 0xb8, 0xfe, 0x59, 0xe2, 0xb9, 0x4c, 0x2a, 0xfa, 0xe8, 0xb7, 0xde, 0xf6, 0x3b,
0xec, 0x0c, 0xa6, 0xee, 0x84, 0xd0, 0x84, 0x66, 0x25, 0x08, 0x7f, 0x3d, 0xab, 0xd0, 0x66, 0xc3,
0xe9, 0xe0, 0x78, 0xcc, 0x0f, 0xa5, 0xa2, 0xd3, 0x9e, 0xf6, 0x73, 0x1b, 0x85, 0xd6, 0xcd, 0x27,
0x75, 0x69, 0x36, 0x9a, 0xb2, 0x51, 0x98, 0x4f, 0xea, 0x7b, 0x9d, 0xef, 0x93, 0xdd, 0xe8, 0xff,
0x98, 0x27, 0x6e, 0xfe, 0xfc, 0x7b, 0x04, 0xe3, 0x33, 0x45, 0x6f, 0x9a, 0xba, 0x56, 0xc4, 0xfe,
0x83, 0x58, 0x55, 0x59, 0xe4, 0xcf, 0xc4, 0xaa, 0x62, 0x19, 0xec, 0xd8, 0xd6, 0x5f, 0xe2, 0x1f,
0x23, 0xe5, 0x7d, 0xc9, 0x18, 0x24, 0xf3, 0xa6, 0xba, 0xf5, 0xfa, 0x53, 0xee, 0xd7, 0xec, 0x39,
0x8c, 0x44, 0x4b, 0xcb, 0xc6, 0x78, 0xa5, 0x93, 0xd9, 0x7e, 0x11, 0x8c, 0x28, 0x42, 0xf7, 0x53,
0xbf, 0xc7, 0x3b, 0x0e, 0x9b, 0xc1, 0x78, 0xe1, 0x71, 0x42, 0x93, 0x0d, 0xff, 0x72, 0xe0, 0x9e,
0xc6, 0x0e, 0x01, 0xd6, 0xc2, 0xe0, 0x8a, 0x4a, 0x55, 0xd9, 0x6c, 0xe4, 0x5f, 0x64, 0x1c, 0x90,
0xf3, 0xca, 0xb2, 0x27, 0x30, 0x76, 0x83, 0x94, 0x56, 0xdd, 0x61, 0xb6, 0x33, 0x8d, 0x8e, 0x07,
0x7c, 0xd7, 0x01, 0x17, 0xea, 0x0e, 0xf3, 0x25, 0xa4, 0x0f, 0xdb, 0x3a, 0x05, 0xde, 0xe5, 0x28,
0x28, 0x70, 0x6b, 0xb6, 0x0f, 0x43, 0xac, 0x85, 0xd2, 0x9d, 0xda, 0x50, 0xb0, 0x02, 0x92, 0x4a,
0x10, 0x7a, 0xad, 0x93, 0xd9, 0x41, 0x11, 0x62, 0x55, 0xf4, 0xb1, 0x2a, 0x2e, 0xfb, 0x58, 0x71,
0xcf, 0xcb, 0x73, 0x80, 0x77, 0x5f, 0x14, 0x5d, 0x90, 0xa0, 0xd6, 0xba, 0x9e, 0x37, 0x42, 0xb7,
0xe1, 0xa2, 0x21, 0x0f, 0x45, 0x7e, 0x09, 0xa3, 0xd7, 0x46, 0xac, 0x16, 0xcb, 0xad, 0x73, 0xbc,
0x82, 0x3d, 0x12, 0x46, 0x22, 0x95, 0x41, 0xbb, 0x9f, 0x67, 0x32, 0x7b, 0xd4, 0xbf, 0xcf, 0xc6,
0x31, 0x9e, 0x06, 0x5e, 0xa8, 0xf2, 0x6f, 0x11, 0x0c, 0x2e, 0x85, 0xdc, 0xda, 0x33, 0x78, 0x1b,
0x6f, 0xbc, 0xfd, 0xed, 0x8e, 0xc1, 0x3f, 0xdd, 0xe1, 0x32, 0x51, 0xa3, 0xb5, 0x42, 0xa2, 0xb7,
0x39, 0xe5, 0x7d, 0xe9, 0xfe, 0x4f, 0xb7, 0x0c, 0x0e, 0x0c, 0xbd, 0x03, 0x93, 0x0e, 0x73, 0x26,
0xb8, 0x88, 0x90, 0x90, 0x12, 0x8d, 0x0f, 0xe6, 0x1f, 0x23, 0x12, 0x38, 0xf9, 0x35, 0x24, 0x57,
0x16, 0x0d, 0x7b, 0x0c, 0x43, 0xa9, 0xcb, 0x4d, 0x32, 0x13, 0xa9, 0xcf, 0xab, 0x8d, 0xc6, 0x78,
0x9b, 0x7f, 0x83, 0x87, 0xfe, 0x1d, 0xc1, 0x44, 0xea, 0xb2, 0xb5, 0xee, 0xd3, 0xd4, 0xd8, 0x7d,
0x43, 0x90, 0xfa, 0xaa, 0x43, 0xe6, 0x23, 0x6f, 0xe5, 0xcb, 0x1f, 0x01, 0x00, 0x00, 0xff, 0xff,
0xf1, 0xe6, 0xc7, 0x44, 0x47, 0x04, 0x00, 0x00,
// 576 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x53, 0x41, 0x6f, 0xd4, 0x3c,
0x10, 0x55, 0xb2, 0xd9, 0x6d, 0x77, 0x36, 0xfd, 0xf4, 0x61, 0x7a, 0x88, 0x8a, 0xaa, 0x2e, 0xe1,
0xd2, 0x03, 0x4a, 0xd1, 0x22, 0x71, 0x6f, 0x01, 0x55, 0xe5, 0x00, 0xc8, 0x6d, 0x2f, 0x5c, 0x22,
0xef, 0x66, 0xea, 0x35, 0x72, 0x36, 0x2b, 0x7b, 0x52, 0xd1, 0x9e, 0xf8, 0x81, 0xfc, 0x0f, 0xfe,
0x06, 0xb2, 0x9d, 0x6c, 0x0b, 0x14, 0xc4, 0xcd, 0xf3, 0xfc, 0x3c, 0x9e, 0xe7, 0xf7, 0x0c, 0xa9,
0x5d, 0x0a, 0x83, 0x55, 0xb1, 0x36, 0x0d, 0x35, 0x6c, 0x24, 0x15, 0x09, 0x7d, 0xb3, 0x77, 0x20,
0x9b, 0x46, 0x6a, 0x3c, 0xf2, 0xe8, 0xbc, 0xbd, 0x3a, 0x22, 0x55, 0xa3, 0x25, 0x51, 0xaf, 0x03,
0x31, 0xff, 0x1a, 0x03, 0x70, 0x5c, 0x37, 0x56, 0x51, 0x63, 0x6e, 0xd8, 0x53, 0x48, 0x2d, 0x35,
0x46, 0x48, 0x2c, 0x57, 0xa2, 0xc6, 0x2c, 0x9e, 0x46, 0x87, 0x63, 0x3e, 0xe9, 0xb0, 0xf7, 0xa2,
0x46, 0xf6, 0x0c, 0x76, 0x0c, 0x6a, 0x41, 0xea, 0x1a, 0xcb, 0xb5, 0xa0, 0x65, 0x36, 0xf0, 0x9c,
0xb4, 0x07, 0x3f, 0x0a, 0x5a, 0xb2, 0x17, 0xb0, 0x2b, 0x15, 0x95, 0xcd, 0xfc, 0x33, 0x2e, 0xa8,
0xac, 0x94, 0xc1, 0x85, 0xeb, 0x9f, 0x25, 0x9e, 0xcb, 0xa4, 0xa2, 0x0f, 0x7e, 0xeb, 0x4d, 0xbf,
0xc3, 0x4e, 0x61, 0xea, 0x4e, 0x08, 0x4d, 0x68, 0x56, 0x82, 0xf0, 0xd7, 0xb3, 0x0a, 0x6d, 0x36,
0x9c, 0x0e, 0x0e, 0xc7, 0x7c, 0x5f, 0x2a, 0x3a, 0xee, 0x69, 0x3f, 0xb7, 0x51, 0x68, 0xdd, 0x7c,
0x52, 0x97, 0x66, 0xa3, 0x29, 0x1b, 0x85, 0xf9, 0xa4, 0xbe, 0xd3, 0xf9, 0x2e, 0xd9, 0x8e, 0xfe,
0x8f, 0x79, 0xe2, 0xe6, 0xcf, 0xbf, 0x47, 0x30, 0x3e, 0x55, 0xf4, 0xba, 0xa9, 0x6b, 0x45, 0xec,
0x3f, 0x88, 0x55, 0x95, 0x45, 0xfe, 0x4c, 0xac, 0x2a, 0x96, 0xc1, 0x96, 0x6d, 0xfd, 0x25, 0xfe,
0x31, 0x52, 0xde, 0x97, 0x8c, 0x41, 0x32, 0x6f, 0xaa, 0x1b, 0xaf, 0x3f, 0xe5, 0x7e, 0xcd, 0x9e,
0xc3, 0x48, 0xb4, 0xb4, 0x6c, 0x8c, 0x57, 0x3a, 0x99, 0xed, 0x16, 0xc1, 0x88, 0x22, 0x74, 0x3f,
0xf6, 0x7b, 0xbc, 0xe3, 0xb0, 0x19, 0x8c, 0x17, 0x1e, 0x27, 0x34, 0xd9, 0xf0, 0x2f, 0x07, 0xee,
0x68, 0x6c, 0x1f, 0x60, 0x2d, 0x0c, 0xae, 0xa8, 0x54, 0x95, 0xcd, 0x46, 0xfe, 0x45, 0xc6, 0x01,
0x39, 0xab, 0x2c, 0x7b, 0x02, 0x63, 0x37, 0x48, 0x69, 0xd5, 0x2d, 0x66, 0x5b, 0xd3, 0xe8, 0x70,
0xc0, 0xb7, 0x1d, 0x70, 0xae, 0x6e, 0x31, 0x5f, 0x42, 0x7a, 0xbf, 0xad, 0x53, 0xe0, 0x5d, 0x8e,
0x82, 0x02, 0xb7, 0x66, 0xbb, 0x30, 0xc4, 0x5a, 0x28, 0xdd, 0xa9, 0x0d, 0x05, 0x2b, 0x20, 0xa9,
0x04, 0xa1, 0xd7, 0x3a, 0x99, 0xed, 0x15, 0x21, 0x56, 0x45, 0x1f, 0xab, 0xe2, 0xa2, 0x8f, 0x15,
0xf7, 0xbc, 0x3c, 0x07, 0x78, 0xfb, 0x45, 0xd1, 0x39, 0x09, 0x6a, 0xad, 0xeb, 0x79, 0x2d, 0x74,
0x1b, 0x2e, 0x1a, 0xf2, 0x50, 0xe4, 0x17, 0x30, 0x3a, 0x31, 0x62, 0xb5, 0x58, 0x3e, 0x38, 0xc7,
0x2b, 0xd8, 0x21, 0x61, 0x24, 0x52, 0x19, 0xb4, 0xfb, 0x79, 0x26, 0xb3, 0x47, 0xfd, 0xfb, 0x6c,
0x1c, 0xe3, 0x69, 0xe0, 0x85, 0x2a, 0xff, 0x16, 0xc1, 0xe0, 0x42, 0xc8, 0x07, 0x7b, 0x06, 0x6f,
0xe3, 0x8d, 0xb7, 0xbf, 0xdd, 0x31, 0xf8, 0xa7, 0x3b, 0x5c, 0x26, 0x6a, 0xb4, 0x56, 0x48, 0xf4,
0x36, 0xa7, 0xbc, 0x2f, 0xdd, 0xff, 0xe9, 0x96, 0xc1, 0x81, 0xa1, 0x77, 0x60, 0xd2, 0x61, 0xce,
0x04, 0x17, 0x11, 0x12, 0x52, 0xa2, 0xf1, 0xc1, 0xfc, 0x63, 0x44, 0x02, 0x27, 0xbf, 0x82, 0xe4,
0xd2, 0xa2, 0x61, 0x8f, 0x61, 0x28, 0x75, 0xb9, 0x49, 0x66, 0x22, 0xf5, 0x59, 0xb5, 0xd1, 0x18,
0x3f, 0xe4, 0xdf, 0xe0, 0xbe, 0x7f, 0x07, 0x30, 0x91, 0xba, 0x6c, 0xad, 0xfb, 0x34, 0x35, 0x76,
0xdf, 0x10, 0xa4, 0xbe, 0xec, 0x90, 0x13, 0xf8, 0xb4, 0x1d, 0xc6, 0x58, 0xcf, 0xe7, 0x23, 0x6f,
0xeb, 0xcb, 0x1f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x1d, 0xed, 0xe0, 0x22, 0x53, 0x04, 0x00, 0x00,
}
// Code generated by protoc-gen-go. DO NOT EDIT.
// source: smarthttp.proto
package gitaly
package gitalypb
import proto "github.com/golang/protobuf/proto"
import fmt "fmt"
......
// Code generated by protoc-gen-go. DO NOT EDIT.
// source: ssh.proto
package gitaly
package gitalypb
import proto "github.com/golang/protobuf/proto"
import fmt "fmt"
......
// Code generated by protoc-gen-go. DO NOT EDIT.
// source: storage.proto
package gitaly
package gitalypb
import proto "github.com/golang/protobuf/proto"
import fmt "fmt"
......
// Code generated by protoc-gen-go. DO NOT EDIT.
// source: wiki.proto
package gitaly
package gitalypb
import proto "github.com/golang/protobuf/proto"
import fmt "fmt"
......
......@@ -4,6 +4,8 @@ package gitaly;
import "google/protobuf/timestamp.proto";
option go_package = "gitalypb";
message Repository {
// DEPRECATED: https://gitlab.com/gitlab-org/gitaly/issues/151
reserved 1;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment