-
Notifications
You must be signed in to change notification settings - Fork 49
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/backport 494 to 2.x fix conflicts #517
Merged
AWSHurneyt
merged 4 commits into
opensearch-project:backport/backport-494-to-2.x
from
jovancacvetkovic:backport/backport-494-to-2.x-fix-conflicts
Apr 13, 2023
Merged
Backport/backport 494 to 2.x fix conflicts #517
AWSHurneyt
merged 4 commits into
opensearch-project:backport/backport-494-to-2.x
from
jovancacvetkovic:backport/backport-494-to-2.x-fix-conflicts
Apr 13, 2023
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…feature (opensearch-project#501) (opensearch-project#506) * [FEATURE] Create detector \ Refactor and move field mapping to first the page of create detector feature opensearch-project#495 Signed-off-by: Jovan Cvetkovic <[email protected]> * [FEATURE] Create detector \ Refactor and move field mapping to first the page of create detector feature opensearch-project#495 Signed-off-by: Jovan Cvetkovic <[email protected]> * [FEATURE] Create detector \ Refactor and move field mapping to first the page of create detector feature opensearch-project#495 Signed-off-by: Jovan Cvetkovic <[email protected]> * [FEATURE] Create detector \ Refactor and move field mapping to first the page of create detector feature opensearch-project#495 Signed-off-by: Jovan Cvetkovic <[email protected]> * [FEATURE] Create detector \ Refactor and move field mapping to first the page of create detector feature opensearch-project#495 Signed-off-by: Jovan Cvetkovic <[email protected]> * [FEATURE] Create detector \ Refactor and move field mapping to first the page of create detector feature opensearch-project#495 Signed-off-by: Jovan Cvetkovic <[email protected]> * [FEATURE] Create detector \ Refactor and move field mapping to first the page of create detector feature opensearch-project#495 Signed-off-by: Jovan Cvetkovic <[email protected]> --------- Signed-off-by: Jovan Cvetkovic <[email protected]> (cherry picked from commit 5425b9b) Co-authored-by: Jovan Cvetkovic <[email protected]>
Signed-off-by: AWSHurneyt <[email protected]> (cherry picked from commit 1f10991) Co-authored-by: AWSHurneyt <[email protected]>
opensearch-project#513) * [FEATURE] Create global state object for async requests opensearch-project#491 Signed-off-by: Jovan Cvetkovic <[email protected]> * [FEATURE] Create global state object for async requests opensearch-project#491 Signed-off-by: Jovan Cvetkovic <[email protected]> * [FEATURE] Create global state object for async requests opensearch-project#491 Signed-off-by: Jovan Cvetkovic <[email protected]> * [FEATURE] Create global state object for async requests opensearch-project#491 Signed-off-by: Jovan Cvetkovic <[email protected]> * [FEATURE] Create global state object for async requests opensearch-project#491 Signed-off-by: Jovan Cvetkovic <[email protected]> * [FEATURE] Create global state object for async requests opensearch-project#491 Signed-off-by: Jovan Cvetkovic <[email protected]> * [FEATURE] Create global state object for async requests opensearch-project#491 Signed-off-by: Jovan Cvetkovic <[email protected]> * [FEATURE] Create global state object for async requests opensearch-project#491 Signed-off-by: Jovan Cvetkovic <[email protected]> * [FEATURE] Create global state object for async requests opensearch-project#491 Signed-off-by: Jovan Cvetkovic <[email protected]> * [FEATURE] Create global state object for async requests opensearch-project#491 Signed-off-by: Jovan Cvetkovic <[email protected]> * [FEATURE] Create global state object for async requests opensearch-project#493 Signed-off-by: Jovan Cvetkovic <[email protected]> * [FEATURE] Create global state object for async requests opensearch-project#493 Signed-off-by: Jovan Cvetkovic <[email protected]> * [FEATURE] Create global state object for async requests opensearch-project#493 Signed-off-by: Jovan Cvetkovic <[email protected]> * Feature] update detector details component opensearch-project#504 Signed-off-by: Jovan Cvetkovic <[email protected]> * Create global state object for async requests opensearch-project#493 Signed-off-by: Jovan Cvetkovic <[email protected]> --------- Signed-off-by: Jovan Cvetkovic <[email protected]> (cherry picked from commit 24c8ec2) Co-authored-by: Jovan Cvetkovic <[email protected]>
…analytics-dashboards-plugin into backport/backport-494-to-2.x-fix-conflicts # Conflicts: # cypress/integration/1_detectors.spec.js
AWSHurneyt
approved these changes
Apr 13, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
fixing the PR conflicts
Check List
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.