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

Sync main commits with develop branch #379

Merged
merged 4 commits into from
Feb 20, 2025

Conversation

SujeethJinesh
Copy link
Collaborator

@SujeethJinesh SujeethJinesh commented Feb 19, 2025

Fixes / Features

Testing / Documentation

Testing details.

  • [ y ] Tests pass
  • [ y ] Appropriate changes to documentation are included in the PR

Copy link
Collaborator

@RoshaniN RoshaniN left a comment

Choose a reason for hiding this comment

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

Thanks Sujeeth, LGTM!

@SujeethJinesh SujeethJinesh changed the title Sujinesh/sync main commits with develop Sync main commits with develop branch Feb 19, 2025
Copy link
Collaborator

@lukebaumann lukebaumann left a comment

Choose a reason for hiding this comment

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

To confirm, this takes changes in the main branch and puts them in the develop branch with no additional changes, correct? Thanks!

@SujeethJinesh
Copy link
Collaborator Author

To confirm, this takes changes in the main branch and puts them in the develop branch with no additional changes, correct? Thanks!

Yes, the only additional changes are some merge conflicts I had to resolve - you can see those specific changes I made, but they should be reasonable

@SujeethJinesh SujeethJinesh enabled auto-merge (squash) February 20, 2025 06:43
* Remove Pathways specific optional args from workload create.

* Deprecate --use-pathways from workload create, set it in create-pathways.

* Remove --enable-pathways from cluster create flow.

* Adding --use-pathways and --enable-pathways args - they are used to determine Pathways flows.
@SujeethJinesh SujeethJinesh force-pushed the sujinesh/sync_main_commits_with_develop branch from b19f697 to 9266670 Compare February 20, 2025 19:39
@SujeethJinesh SujeethJinesh merged commit 81004f7 into develop Feb 20, 2025
7 checks passed
@SujeethJinesh SujeethJinesh deleted the sujinesh/sync_main_commits_with_develop branch February 20, 2025 20:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants