Skip to content

Conversation

GnaneshKunal
Copy link
Contributor

@GnaneshKunal GnaneshKunal commented Feb 24, 2023

Merging main into the profile-explain branch

Fixes conflicts related to profile/explain

egor-zalenski and others added 30 commits January 26, 2023 16:00
…connections

#RI-4034 - [BE] Export connections
…connection

#RI-4035 - export connections to json
…ey-name-filter-used

E2e/feature/ri 3857 save key name filter used
# Conflicts:
#	redisinsight/api/migration/index.ts
#	yarn.lock
Merge main into release 2.18.0
#RI-4021 - Update telemetry WORKBENCH_COMMAND_COPY event
…ion_link

#RI-4104 - update recommendation link
nmammadli and others added 22 commits February 20, 2023 10:57
…ding-wb-ft-index

E2e/feature/ri 4070 onboarding wb ft index
…ing-wb-ft-index

#RI-4070 - Add FT.INFO index for onboarding
…fields_can't_be_removed

#RI-4210 - Fields/Members from Hash/Set keys with some special characters can't be deleted
split prod web js bundle to chunks
…est_Redis_OSS_with_RediSearch_2.2

Feature/ri 4216 set up a test redis oss with redi search 2.2
@GnaneshKunal GnaneshKunal self-assigned this Feb 24, 2023
@GnaneshKunal GnaneshKunal marked this pull request as ready for review February 24, 2023 14:34
Copy link
Collaborator

@ArtemHoruzhenko ArtemHoruzhenko left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why we have a lot of changes not related to RI-3726 in the fe/RI-3726_profile_explain_latest_main_merge branch?

Copy link
Collaborator

@ArtemHoruzhenko ArtemHoruzhenko left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In general I'm fine but, please, make sure that there are no conflicts when we will merge feature/* branch into main

@GnaneshKunal
Copy link
Contributor Author

@arthosofteq Profile-Explain feature branch didn't track the main branch since its creation and now there are some changes related to oss cluster testing in the main branch which is required to properly test the Profile-Explain feature in oss cluster. So the PR - as requested by @nmammadli. Basically this is a merge of main into Profile-Explain branch.

please, make sure that there are no conflicts when we will merge feature/* branch into main

Sure.

@GnaneshKunal GnaneshKunal merged commit f3ed15d into feature/RI-3726_profile_explain Feb 25, 2023
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.

7 participants