-
Notifications
You must be signed in to change notification settings - Fork 31
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
Sync main commits with develop branch #379
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks Sujeeth, LGTM!
There was a problem hiding this 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!
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 |
* 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.
b19f697
to
9266670
Compare
Fixes / Features
develop
branch is out of sync with themain
branch, but we need features that were recently pushed onto it. This change will bring the lingering commits from themain
branch into thedevelop
branch.Testing / Documentation
Testing details.