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

[Backport 2.x] Adds ExtensionsManager.lookupExtensionSettingsById #7492

Merged
merged 4 commits into from
May 10, 2023
Merged

[Backport 2.x] Adds ExtensionsManager.lookupExtensionSettingsById #7492

merged 4 commits into from
May 10, 2023

Conversation

cwperks
Copy link
Member

@cwperks cwperks commented May 9, 2023

Backport #7466 to 2.x

cwperks added 3 commits May 9, 2023 17:01
@cwperks
Adds ExtensionsManager.lookupExtensionSettingsById (opensearch-projec…
c281a8e 
…t#7466)

* Add ExtensionsManager.lookupExtensionSettings

Signed-off-by: Craig Perkins <[email protected]>

* Small change to name

Signed-off-by: Craig Perkins <[email protected]>

* Add to CHANGELOG

Signed-off-by: Craig Perkins <[email protected]>

* Move extensionSettingsMap.put

Signed-off-by: Craig Perkins <[email protected]>

* Re-run CI

Signed-off-by: Craig Perkins <[email protected]>

---------

Signed-off-by: Craig Perkins <[email protected]>
(cherry picked from commit 16555e4)
@cwperks
Add import Optional
ec42258 
Signed-off-by: Craig Perkins <[email protected]>
@cwperks
Remove merge conflicts
9c16c68 
Signed-off-by: Craig Perkins <[email protected]>
@saratvemulapalli
Copy link
Member

Thanks @cwperks for the backport. Could you take care of the conflicts?

@cwperks
Copy link
Member Author

cwperks commented May 9, 2023

@saratvemulapalli I just resolved the conflicts. Every time I try to follow the steps here and resolve the conflicts locally they still seem to appear when I push the code to github. Do you know why that may be?

@github-actions
Copy link
Contributor

github-actions bot commented May 9, 2023

Gradle Check (Jenkins) Run Completed with:

@github-actions
Copy link
Contributor

github-actions bot commented May 9, 2023

Gradle Check (Jenkins) Run Completed with:

@saratvemulapalli
Copy link
Member

here

hmmm honestly I just follow natural steps:

  • Sync my fork with origin main and 2.x
  • Get commit id from main, cherry-pick to 2.x on fork
  • Resolve conflicts and push changes.

@saratvemulapalli
Copy link
Member

saratvemulapalli commented May 9, 2023 •
edited
Loading

:/
#6287

[org.opensearch.cluster.shards.ClusterShardLimitIT.testCreateIndexWithMaxClusterShardSetting](https://build.ci.opensearch.org/job/gradle-check/15151/testReport/junit/org.opensearch.cluster.shards/ClusterShardLimitIT/testCreateIndexWithMaxClusterShardSetting/)
[org.opensearch.cluster.shards.ClusterShardLimitIT.testCreateIndexWithMaxClusterShardSetting](https://build.ci.opensearch.org/job/gradle-check/15151/testReport/junit/org.opensearch.cluster.shards/ClusterShardLimitIT/testCreateIndexWithMaxClusterShardSetting_2/)
[org.opensearch.cluster.shards.ClusterShardLimitIT.testCreateIndexWithMaxClusterShardSetting](https://build.ci.opensearch.org/job/gradle-check/15151/testReport/junit/org.opensearch.cluster.shards/ClusterShardLimitIT/testCreateIndexWithMaxClusterShardSetting_3/)
[org.opensearch.cluster.shards.ClusterShardLimitIT.testCreateIndexWithMaxClusterShardSetting](https://build.ci.opensearch.org/job/gradle-check/15151/testReport/junit/org.opensearch.cluster.shards/ClusterShardLimitIT/testCreateIndexWithMaxClusterShardSetting_4/)
[org.opensearch.indices.replication.SegmentReplicationRelocationIT.testRelocateWhileContinuouslyIndexingAndWaitingForRefresh](https://build.ci.opensearch.org/job/gradle-check/15151/testReport/junit/org.opensearch.indices.replication/SegmentReplicationRelocationIT/testRelocateWhileContinuouslyIndexingAndWaitingForRefresh/)
[org.opensearch.search.SearchWeightedRoutingIT.testStrictWeightedRoutingWithCustomString](https://build.ci.opensearch.org/job/gradle-check/15151/testReport/junit/org.opensearch.search/SearchWeightedRoutingIT/testStrictWeightedRoutingWithCustomString/)
[org.opensearch.search.SearchWeightedRoutingIT.testStrictWeightedRoutingWithCustomString](https://build.ci.opensearch.org/job/gradle-check/15151/testReport/junit/org.opensearch.search/SearchWeightedRoutingIT/testStrictWeightedRoutingWithCustomString_2/)
[org.opensearch.search.SearchWeightedRoutingIT.testStrictWeightedRoutingWithCustomString](https://build.ci.opensearch.org/job/gradle-check/15151/testReport/junit/org.opensearch.search/SearchWeightedRoutingIT/testStrictWeightedRoutingWithCustomString_3/)

@github-actions
Copy link
Contributor

github-actions bot commented May 9, 2023

Gradle Check (Jenkins) Run Completed with:

@saratvemulapalli saratvemulapalli merged commit 47a3d8a into opensearch-project:2.x May 10, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@saratvemulapalli saratvemulapalli saratvemulapalli approved these changes

@reta reta Awaiting requested review from reta reta is a code owner

@anasalkouz anasalkouz Awaiting requested review from anasalkouz anasalkouz is a code owner

@andrross andrross Awaiting requested review from andrross andrross is a code owner

@Bukhtawar Bukhtawar Awaiting requested review from Bukhtawar Bukhtawar is a code owner

@CEHENKLE CEHENKLE Awaiting requested review from CEHENKLE CEHENKLE is a code owner

@dblock dblock Awaiting requested review from dblock dblock is a code owner

@gbbafna gbbafna Awaiting requested review from gbbafna gbbafna is a code owner

@setiah setiah Awaiting requested review from setiah

@kartg kartg Awaiting requested review from kartg

@kotwanikunal kotwanikunal Awaiting requested review from kotwanikunal kotwanikunal is a code owner

@mch2 mch2 Awaiting requested review from mch2 mch2 is a code owner

@nknize nknize Awaiting requested review from nknize nknize is a code owner

@owaiskazi19 owaiskazi19 Awaiting requested review from owaiskazi19 owaiskazi19 is a code owner

@Rishikesh1159 Rishikesh1159 Awaiting requested review from Rishikesh1159 Rishikesh1159 is a code owner

@ryanbogan ryanbogan Awaiting requested review from ryanbogan

@shwetathareja shwetathareja Awaiting requested review from shwetathareja shwetathareja is a code owner

@dreamer-89 dreamer-89 Awaiting requested review from dreamer-89

@tlfeng tlfeng Awaiting requested review from tlfeng

@VachaShah VachaShah Awaiting requested review from VachaShah VachaShah is a code owner

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@cwperks @saratvemulapalli