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

Fix max workflows setting test #268

Merged
merged 1 commit into from
Dec 13, 2023

Conversation

dbwiddis
Copy link
Member

@dbwiddis dbwiddis commented Dec 9, 2023

Description

Fixes a typo where the setting wasn't actually being checked and was using the default.

Also fixed some javadoc warnings

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

Signed-off-by: Daniel Widdis <[email protected]>
@amitgalitz
Copy link
Member

btw if we merge this to main, it will mean it will be slightly out of order when we merge things back from feature branch. We might have already broken the order in other places though

@dbwiddis
Copy link
Member Author

it will mean it will be slightly out of order when we merge things back from feature branch. We might have already broken the order in other places though

Ordering doesn't matter much, it's whether there are conflicting changes to the same files. One file hasn't been touched on the feature branch, one has changes only from backporting something from main, and the last has only overlapping identical changes in imports (which won't conflict) and changed lines of code that won't conflict.

@dbwiddis dbwiddis merged commit 551e768 into opensearch-project:main Dec 13, 2023
21 checks passed
@dbwiddis dbwiddis deleted the max-workflow-test branch December 13, 2023 16:24
opensearch-trigger-bot bot pushed a commit that referenced this pull request Dec 13, 2023
Signed-off-by: Daniel Widdis <[email protected]>
(cherry picked from commit 551e768)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
opensearch-trigger-bot bot pushed a commit that referenced this pull request Dec 13, 2023
Signed-off-by: Daniel Widdis <[email protected]>
(cherry picked from commit 551e768)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
dbwiddis pushed a commit that referenced this pull request Dec 13, 2023
Fix max workflows setting test (#268)


(cherry picked from commit 551e768)

Signed-off-by: Daniel Widdis <[email protected]>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
dbwiddis pushed a commit that referenced this pull request Dec 13, 2023
Fix max workflows setting test (#268)


(cherry picked from commit 551e768)

Signed-off-by: Daniel Widdis <[email protected]>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants