Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bring fork up-to-date with upstream changes. #3

Merged
merged 18 commits into from
Jan 24, 2024

Conversation

bbonenfant
Copy link

Link to the pachyderm-sdk upgrade PR: pachyderm/pachyderm#9672

wouterh and others added 17 commits January 23, 2024 15:30
Co-authored-by: konstantin <konstantin.klein@hochfrequenz.de>
Co-authored-by: James Hilton-Balfe <gobot1234yt@gmail.com>
Fixes danielgtaylor#427
Fixes danielgtaylor#438
# Conflicts:
#	poetry.lock

# Conflicts:
#	poetry.lock
#	pyproject.toml
Co-authored-by: James Hilton-Balfe <gobot1234yt@gmail.com>
# Conflicts:
#	poetry.lock
#	pyproject.toml

# Conflicts:
#	poetry.lock
#	pyproject.toml
# Conflicts:
#	tests/test_features.py

# Conflicts:
#	tests/test_features.py
# Conflicts:
#	poetry.lock
#	pyproject.toml

# Conflicts:
#	poetry.lock
#	pyproject.toml
Co-authored-by: James Hilton-Balfe <gobot1234yt@gmail.com>
Co-authored-by: James Hilton-Balfe <gobot1234yt@gmail.com>
Co-authored-by: James Hilton-Balfe <gobot1234yt@gmail.com>

# Conflicts:
#	CHANGELOG.md
#	pyproject.toml

# Conflicts:
#	CHANGELOG.md
#	pyproject.toml
…nielgtaylor#510)

# Conflicts:
#	poetry.lock
#	src/betterproto/__init__.py
#	src/betterproto/plugin/parser.py

# Conflicts:
#	poetry.lock
#	pyproject.toml
# Conflicts:
#	pyproject.toml
@bbonenfant bbonenfant marked this pull request as ready for review January 24, 2024 19:19
@bbonenfant bbonenfant requested a review from smalyala January 24, 2024 19:19
maintenance-pachyderm.md Outdated Show resolved Hide resolved
@bbonenfant bbonenfant merged commit 549f723 into grpcio-support Jan 24, 2024
1 of 17 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants