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

add conversation system indices for conversation memory experimental … #3326

Merged

Conversation

HenryL27
Copy link
Contributor

@HenryL27 HenryL27 commented Sep 7, 2023

…feature

Description

add the conversation memory experimental feature system indices as system indices

Issues Resolved

ml-commons 1150

Is this a backport? If so, please add backport PR # and/or commits #

Testing

[Please provide details of testing done: unit testing, integration testing and manual testing]

Check List

  • New functionality includes testing
  • New functionality has been documented
  • 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.

…feature

Signed-off-by: HenryL27 <hmlindeman@yahoo.com>
@codecov
Copy link

codecov bot commented Sep 7, 2023

Codecov Report

Merging #3326 (3ee04bf) into main (1034cef) will increase coverage by 0.94%.
Report is 4 commits behind head on main.
The diff coverage is n/a.

Impacted file tree graph

@@             Coverage Diff              @@
##               main    #3326      +/-   ##
============================================
+ Coverage     63.24%   64.19%   +0.94%     
- Complexity     3452     3471      +19     
============================================
  Files           263      263              
  Lines         20053    20112      +59     
  Branches       3348     3359      +11     
============================================
+ Hits          12683    12910     +227     
+ Misses         5741     5528     -213     
- Partials       1629     1674      +45     

see 15 files with indirect coverage changes

@cwperks cwperks added the backport 2.x backport to 2.x branch label Sep 7, 2023
@cwperks cwperks merged commit 72c6186 into opensearch-project:main Sep 7, 2023
58 checks passed
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.x failed:

The process '/usr/bin/git' failed with exit code 128

To backport manually, run these commands in your terminal:

# Navigate to the root of your repository
cd $(git rev-parse --show-toplevel)
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/security/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/security/backport-2.x
# Create a new branch
git switch --create backport/backport-3326-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 72c61865b4c318a64ad0c14041797a7f4d2d46fd
# Push it to GitHub
git push --set-upstream origin backport/backport-3326-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/security/backport-2.x

Then, create a pull request where the base branch is 2.x and the compare/head branch is backport/backport-3326-to-2.x.

@cwperks
Copy link
Member

cwperks commented Sep 7, 2023

Opening up a manual backport

peternied pushed a commit that referenced this pull request Sep 7, 2023
Backport of
- #3326
- #3237

Signed-off-by: Craig Perkins <cwperx@amazon.com>
Co-authored-by: HenryL27 <hmlindeman@yahoo.com>
opensearch-trigger-bot bot pushed a commit that referenced this pull request Sep 7, 2023
Backport of
- #3326
- #3237

Signed-off-by: Craig Perkins <cwperx@amazon.com>
Co-authored-by: HenryL27 <hmlindeman@yahoo.com>
(cherry picked from commit f7991de)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 2.x backport to 2.x branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants