Skip to content

[Backport 2.x] Set order of tenant_template to the highest to avoid being overridden by custom templates#1250

Merged
cliu123 merged 1 commit into2.xfrom
backport/backport-1247-to-2.x
Dec 10, 2022
Merged

[Backport 2.x] Set order of tenant_template to the highest to avoid being overridden by custom templates#1250
cliu123 merged 1 commit into2.xfrom
backport/backport-1247-to-2.x

Conversation

@opensearch-trigger-bot
Copy link
Copy Markdown
Contributor

Backport dcf75c4 from #1247

… by custom templates (#1247)

Signed-off-by: Chang Liu <lc12251109@gmail.com>
(cherry picked from commit dcf75c4)
@opensearch-trigger-bot opensearch-trigger-bot bot requested a review from a team December 10, 2022 04:51
@codecov-commenter
Copy link
Copy Markdown

Codecov Report

Merging #1250 (93246d0) into 2.x (1c08cc1) will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff           @@
##              2.x    #1250   +/-   ##
=======================================
  Coverage   71.78%   71.78%           
=======================================
  Files          88       88           
  Lines        2027     2027           
  Branches      269      269           
=======================================
  Hits         1455     1455           
  Misses        509      509           
  Partials       63       63           

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

@cliu123
Copy link
Copy Markdown
Member

cliu123 commented Dec 10, 2022

One of the integration tests runs fail due to a known flaky test. Besides, the other integration tests run passes. Merging the PR.

@cliu123 cliu123 merged commit 61f0014 into 2.x Dec 10, 2022
@github-actions github-actions bot deleted the backport/backport-1247-to-2.x branch December 10, 2022 05:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants