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.

Sign up for GitHub

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

Jump to bottom

[Core] Update usage_pb2.py #39425

Merged
merged 1 commit into from
Sep 8, 2023
Merged

[Core] Update usage_pb2.py #39425

merged 1 commit into from
Sep 8, 2023

Conversation

jjyao
Copy link
Contributor

@jjyao jjyao commented Sep 8, 2023

Why are these changes needed?

This is a merge conflict with #39210 where we need to manually check in generated proto source files.

Related issue number

Checks

  • I've signed off every commit(by using the -s flag, i.e., git commit -s) in this PR.
  • I've run scripts/format.sh to lint the changes in this PR.
  • I've included any doc changes needed for https://docs.ray.io/en/master/.
    • I've added any new APIs to the API Reference. For example, if I added a
      method in Tune, I've added it in doc/source/tune/api/ under the
      corresponding .rst file.
  • I've made sure the tests are passing. Note that there might be a few flaky tests, see the recent failures at https://flakey-tests.ray.io/
  • Testing Strategy
    • Unit tests
    • Release tests
    • This PR is not tested :(

@jjyao
Update usage_pb2.py
3f469dc 
Signed-off-by: Jiajun Yao <jeromeyjj@gmail.com>
can-anyscale
can-anyscale approved these changes Sep 8, 2023
View reviewed changes
Copy link
Collaborator

@can-anyscale can-anyscale left a comment •
edited by aslonnie

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Accept to unblock; it if is mergable it works!

@jjyao jjyao mentioned this pull request Sep 8, 2023
Closed
matthewdeng
matthewdeng approved these changes Sep 8, 2023
View reviewed changes
Copy link
Contributor

@matthewdeng matthewdeng left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.


via NFL on GIPHY

@aslonnie aslonnie merged commit 0f5b6f5 into ray-project:master Sep 8, 2023
19 of 83 checks passed
@jjyao jjyao deleted the jjyao/conflict branch September 8, 2023 01:20
jimthompson5802 pushed a commit to jimthompson5802/ray that referenced this pull request Sep 12, 2023
@jjyao @jimthompson5802
Update usage_pb2.py (ray-project#39425)
bdfd5b2 
check in missed generated proto source files due to concurrent merges.

Signed-off-by: Jiajun Yao <jeromeyjj@gmail.com>
Signed-off-by: Jim Thompson <jimthompson5802@gmail.com>
vymao pushed a commit to vymao/ray that referenced this pull request Oct 11, 2023
@jjyao
Update usage_pb2.py (ray-project#39425)
b963de4 
check in missed generated proto source files due to concurrent merges.

Signed-off-by: Jiajun Yao <jeromeyjj@gmail.com>
Signed-off-by: Victor <vctr.y.m@example.com>
@rickyyx rickyyx mentioned this pull request Oct 24, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@matthewdeng matthewdeng matthewdeng approved these changes

@fishbone fishbone fishbone approved these changes

@can-anyscale can-anyscale can-anyscale approved these changes

Assignees

@fishbone fishbone

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@jjyao @matthewdeng @fishbone @can-anyscale @aslonnie