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

Revision of branch synchronization #5681

Closed
yenienserrano opened this issue Jul 14, 2023 · 0 comments · Fixed by #5685 or #5708
Closed

Revision of branch synchronization #5681

yenienserrano opened this issue Jul 14, 2023 · 0 comments · Fixed by #5685 or #5708
Assignees
@yenienserrano
Labels
level/task Task issue request/operational Operational requests type/change

Comments

@yenienserrano
Copy link
Member

yenienserrano commented Jul 14, 2023 •
edited by Desvelao
Loading

Description
Using the application I noticed that in the agent view the inventory data, stats and configuration buttons do not work, looking for why it could happen I noticed that in the update of the branches for release 4.4.5 the branches of 4.6.0, 4.7.0 and master have errors due to merge conflicts, we would have to review the PR of the merge to see if other files were wrong.

If any errors are found, check if they are in the other PRs to fix them in all branches.

4.6.0: #5671
4.7.0: #5675
master: #5672

Task

plugins/main/public/components/common/welcome/agents-welcome.js

  • notNeedStatus removed, but it should be in renderTitle() line 263
  • Remove changelog entry
  • Remove compresIPv6 service
  • Update yarn.lock
  • Update rendering OS platform
@yenienserrano yenienserrano added type/bug Bug issue level/task Task issue labels Jul 14, 2023
@yenienserrano yenienserrano self-assigned this Jul 17, 2023
@yenienserrano yenienserrano mentioned this issue Jul 17, 2023
Merged
6 tasks
@yenienserrano yenienserrano linked a pull request Jul 17, 2023 that will close this issue
Fixes redirection problem to inventory data, stats and configuration in an agent #5685
Merged
6 tasks
@gdiazlo gdiazlo added request/operational Operational requests type/change and removed type/bug Bug issue labels Jul 17, 2023
@wazuhci wazuhci moved this to Pending review in Release 4.6.0 Jul 17, 2023
@Desvelao Desvelao linked a pull request Jul 20, 2023 that will close this issue
Fix conflicts in branch synchronization #5708
Merged
6 tasks
@Desvelao Desvelao mentioned this issue Jul 20, 2023
Merged
6 tasks
@wazuhci wazuhci moved this from Pending review to Done in Release 4.6.0 Jul 20, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees

@yenienserrano yenienserrano

Labels
level/task Task issue request/operational Operational requests type/change
Projects
No open projects
Release 4.6.0
Status: Done
Milestone
No milestone
3 participants
@gdiazlo @Desvelao @yenienserrano