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

[Backport 1.x] Updating .gitattributes for additional file types #1766

Merged
merged 1 commit into from
Dec 17, 2021
Merged

[Backport 1.x] Updating .gitattributes for additional file types #1766

merged 1 commit into from
Dec 17, 2021

Conversation

saratvemulapalli
Copy link
Member

@saratvemulapalli saratvemulapalli commented Dec 17, 2021

Description

Backporting #1727 to 1.x

Issues Resolved

Closes #1713

Check List

  • New functionality includes testing.
    • All tests pass
  • New functionality has been documented.
    • New functionality has javadoc added
  • Commits are signed per the DCO using --signoff

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.

* Adding release notes for 1.2.1

Signed-off-by: Sarat Vemulapalli <vemulapallisarat@gmail.com>

* Updating .gitattributes for additional types

Signed-off-by: Sarat Vemulapalli <vemulapallisarat@gmail.com>
@opensearch-ci-bot
Copy link
Collaborator

Can one of the admins verify this patch?

@saratvemulapalli saratvemulapalli added backport PRs or issues specific to backporting features or enhancments backport 1.x labels Dec 17, 2021
@opensearch-ci-bot
Copy link
Collaborator

❌   Gradle Check failure 031900f
Log 1584

Reports 1584

@saratvemulapalli
Copy link
Member Author

REPRODUCE WITH: ./gradlew ':server:internalClusterTest' --tests "org.opensearch.discovery.StableMasterDisruptionIT.testStaleMasterNotHijackingMajority" -Dtests.seed=28AD28E1A3FF50C7 -Dtests.security.manager=true -Dtests.jvm.argline="-XX:TieredStopAtLevel=1 -XX:ReservedCodeCacheSize=64m" -Dtests.locale=en-PH -Dtests.timezone=Etc/GMT+8 -Druntime.java=15

org.opensearch.discovery.StableMasterDisruptionIT > testStaleMasterNotHijackingMajority FAILED
    java.lang.AssertionError: node_t1: [Tuple [v1=node_t2, v2=null]]
        at __randomizedtesting.SeedInfo.seed([28AD28E1A3FF50C7:77AB65EE82248FCB]:0)
        at org.junit.Assert.fail(Assert.java:88)
        at org.junit.Assert.assertTrue(Assert.java:41)
        at org.opensearch.discovery.StableMasterDisruptionIT.lambda$testStaleMasterNotHijackingMajority$5(StableMasterDisruptionIT.java:253)
        at org.opensearch.test.OpenSearchTestCase.assertBusy(OpenSearchTestCase.java:1048)
        at org.opensearch.test.OpenSearchTestCase.assertBusy(OpenSearchTestCase.java:1021)
        at org.opensearch.discovery.StableMasterDisruptionIT.testStaleMasterNotHijackingMajority(StableMasterDisruptionIT.java:250)

> Task :client:rest-high-level:javadoc
> Task :client:rest-high-level:spotlessCheck
> Task :client:rest-high-level:check

> Task :server:internalClusterTest

@saratvemulapalli
Copy link
Member Author

start gradle check

@opensearch-ci-bot
Copy link
Collaborator

✅   Gradle Check success 031900f
Log 1585

Reports 1585

@saratvemulapalli saratvemulapalli merged commit 022442b into opensearch-project:1.x Dec 17, 2021
@saratvemulapalli saratvemulapalli deleted the git-attributes-1.x branch December 17, 2021 23:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport PRs or issues specific to backporting features or enhancments backport 1.x
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants