chore: update protobuf library versions and remove influx_tsm (#21882) #21891
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
lesam
force-pushed
the
backport-proto-1.8
branch
11 times, most recently
from
cb35eda to
2c31c7c
Compare
danxmoran
reviewed
Jul 20, 2021
go.mod
Outdated
| @@ -7,15 +7,15 @@ require ( | |||
| collectd.org v0.3.0 | |||
| github.com/BurntSushi/toml v0.3.1 | |||
| github.com/apache/arrow/go/arrow v0.0.0-20191024131854-af6fa24be0db | |||
| github.com/benbjohnson/tmpl v1.1.0 // indirect | |||
There was a problem hiding this comment.
Can we make sure that this import is in tools.go? Guessing from the // indirect that it's not there.
There was a problem hiding this comment.
Good catch - thanks! In fact 1.8 doesn't have a tools.go at all, added one as a copy of 1.9
lesam
force-pushed
the
backport-proto-1.8
branch
from
1b0f4d8 to
3fa97be
Compare
danxmoran
previously approved these changes
Jul 20, 2021
…data#21882) * chore: update protobufs * fix: run codegen during build * fix: fully remove influx_tsm
lesam
force-pushed
the
backport-proto-1.8
branch
from
3fa97be to
2882d2f
Compare
|
Fixed merge conflict with the 1.8 perftest PR |
danxmoran
approved these changes
Jul 20, 2021
lesam
added a commit
to lesam/influxdb
that referenced
this pull request
Jul 21, 2021
…data#21882) (influxdata#21891) * chore: update protobuf library versions and remove influx_tsm (influxdata#21882) * chore: update protobufs * fix: run codegen during build * fix: fully remove influx_tsm * fix: codegen works * fix: add tools.go for 1.8 (cherry picked from commit 51600c8)
4 tasks
lesam
added a commit
to lesam/influxdb
that referenced
this pull request
Jul 21, 2021
…data#21882) (influxdata#21891) * chore: update protobuf library versions and remove influx_tsm (influxdata#21882) * chore: update protobufs * fix: run codegen during build * fix: fully remove influx_tsm * fix: codegen works * fix: add tools.go for 1.8 (cherry picked from commit 51600c8)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Backport of master-1.x branch, plus:
storage/reads/datatypes/gen.go, previously fixed inmaster-1.x, plus added two scripts in thescriptsdirectory to support codegenprometheus/remote/generate.go