Skip to content

Commit

Permalink
roachpb: separate out comment re: minor/major version fields
Browse files Browse the repository at this point in the history
cockroachdb#17650 renamed these fields
for the protobuf-generated C++ code, leaving the Go code unchanged.
Isolate the associated comment so it doesn't confusingly appear in the
Go code.

Release note: None
  • Loading branch information
irfansharif committed Feb 26, 2020
1 parent dc423c3 commit 869d96f
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 19 deletions.
36 changes: 17 additions & 19 deletions pkg/roachpb/metadata.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions pkg/roachpb/metadata.proto
Original file line number Diff line number Diff line change
Expand Up @@ -375,6 +375,7 @@ message Version {

// The names "major" and "minor" are reserved in C in
// some platforms (e.g. FreeBSD).

optional int32 major_val = 1 [(gogoproto.nullable) = false, (gogoproto.customname) = "Major"];
optional int32 minor_val = 2 [(gogoproto.nullable) = false, (gogoproto.customname) = "Minor"];
// Note that patch is a placeholder and will always be zero.
Expand Down

0 comments on commit 869d96f

Please sign in to comment.