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

add JAVA_HOME to indexer for securityadmin.sh commands #705

Open
wants to merge 26 commits into
base: master
Choose a base branch
from
Open

add JAVA_HOME to indexer for securityadmin.sh commands #705

wants to merge 26 commits into from

Conversation

morph027
Copy link

@morph027 morph027 commented Aug 8, 2022

Signed-off-by: morph027 [email protected]

alberpilot and others added 26 commits November 24, 2021 17:01
@alberpilot
Bumped to 4.4.0
84fe19e
@teddytpc1
Bump to 4.2.6
85e62cf
@alberpilot
Merge pull request wazuh#596 from wazuh/595-bump_426
a4be008 
Bump to 4.2.6
@teddytpc1
Merge branch 'master' into 4.2-merge_master
3e54eeb
@alberpilot
Merge pull request wazuh#598 from wazuh/4.2-merge_master
9cd399c 
Merge 4.2 into master
@vcerenu
Merge 4.3 into master
b21c376
@alberpilot
Merge pull request wazuh#648 from wazuh/merge_master
97f5a6b 
Merge 4.3 into master
@vcerenu
bump release 4.5.0
01d2e4a
@vcerenu
bump release 4.5.0
41aba4a
@vcerenu
bump release 4.5.0
1077ea7
@alberpilot
Merge pull request wazuh#650 from wazuh/bump_4_5
9099671 
Bump release 4.5.0
@vcerenu
Merge 4.3.3 into master
e538188
@vcerenu
Merge 4.3.3 into master
b1c05d8
@okynos
Merge pull request wazuh#665 from wazuh/merge_master
89a0def 
Merge 4.3.3 into master
@daxxog
Allow other Exceptions to bubble up a stack trace instead of silently…
d5bd975 
… failing in create_user.py
@alberpilot
Merge pull request wazuh#576 from daxxog/master
f5afd6b 
Allow other Exceptions to bubble up a stack trace instead of silently failing in create_user.py
@fcaffieri
disable filebeat metrics
5c06d22
@fcaffieri
disable filebeat metrics
907f752
@okynos
Merge pull request wazuh#686 from wazuh/1667-disable-filebeat-metrics…
db6ef42 
…-tomaster

Disable filebeat metrics
@fcaffieri
Add fix to avoid GLIBC crash
16aec13
@fcaffieri
Add fix to avoid GLIBC crash, fix identation
6e5d746
@okynos
Merge pull request wazuh#690 from wazuh/1665-Fix-filebeat-crash-due-t…
69d3490 
…o-glibc-tomaster

Add fix to avoid GLIBC crash
@vcerenu
bump 4.3 into master
d227048
@vcerenu
bump 4.3 into master
9d65678
@okynos
Merge pull request wazuh#696 from wazuh/merge-43-master
2c52963 
Merge 4.3.6 into master
@morph027
add JAVA_HOME to indexer for securityadmin.sh commands
c77ff03 
Signed-off-by: morph027 <[email protected]>
@teddytpc1 teddytpc1 self-requested a review August 29, 2022 11:08
@teddytpc1
Copy link
Member

teddytpc1 commented Aug 29, 2022 •
edited
Loading

Hi @morph027.
Thanks for your contribution. I have tested the changes and it works fine.
Could you please do the following?

  • Create a new branch from 4.3.
  • Introduce your changes into that new branch.
  • Create a new PR from the new branch to 4.3.

We should merge these changes into 4.3.

@morph027
Copy link
Author

Jip, will do, thanks for the hint!

@teddytpc1
Copy link
Member

Hi @morph027.
Can you open the PR using branch 4.3, please?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@teddytpc1 teddytpc1 Awaiting requested review from teddytpc1

At least 1 approving review is required to merge this pull request.

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@morph027 @teddytpc1 @alberpilot @vcerenu @okynos @daxxog @fcaffieri