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

Merge 4.3-7.10 into master #4669

Merged
merged 5 commits into from
Oct 13, 2022
Merged

Merge 4.3-7.10 into master #4669

merged 5 commits into from
Oct 13, 2022

Conversation

AlexRuiz7
Copy link
Member

Description

Sync branches for release 4.3.9

Issues Resolved

#4582

@AlexRuiz7 AlexRuiz7 requested a review from a team as a code owner October 13, 2022 13:00
@AlexRuiz7 AlexRuiz7 merged commit 589dae5 into master Oct 13, 2022
@AlexRuiz7 AlexRuiz7 deleted the 4.3-7.10 branch October 13, 2022 13:01
@github-actions
Copy link
Contributor

The backport to 4.3-7.16 failed:

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

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-4.3-7.16 4.3-7.16
# Navigate to the new working tree
cd .worktrees/backport-4.3-7.16
# Create a new branch
git switch --create backport-4669-to-4.3-7.16
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 589dae5a20a9b5a738fae5ad782eb1d10dcee0c8
# Push it to GitHub
git push --set-upstream origin backport-4669-to-4.3-7.16
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-4.3-7.16

Then, create a pull request where the base branch is 4.3-7.16 and the compare/head branch is backport-4669-to-4.3-7.16.

@github-actions
Copy link
Contributor

The backport to 4.3-1.2-wzd failed:

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

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-4.3-1.2-wzd 4.3-1.2-wzd
# Navigate to the new working tree
cd .worktrees/backport-4.3-1.2-wzd
# Create a new branch
git switch --create backport-4669-to-4.3-1.2-wzd
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 589dae5a20a9b5a738fae5ad782eb1d10dcee0c8
# Push it to GitHub
git push --set-upstream origin backport-4669-to-4.3-1.2-wzd
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-4.3-1.2-wzd

Then, create a pull request where the base branch is 4.3-1.2-wzd and the compare/head branch is backport-4669-to-4.3-1.2-wzd.

@github-actions
Copy link
Contributor

The backport to 4.4-7.16 failed:

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

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-4.4-7.16 4.4-7.16
# Navigate to the new working tree
cd .worktrees/backport-4.4-7.16
# Create a new branch
git switch --create backport-4669-to-4.4-7.16
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 589dae5a20a9b5a738fae5ad782eb1d10dcee0c8
# Push it to GitHub
git push --set-upstream origin backport-4669-to-4.4-7.16
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-4.4-7.16

Then, create a pull request where the base branch is 4.4-7.16 and the compare/head branch is backport-4669-to-4.4-7.16.

@github-actions
Copy link
Contributor

The backport to 4.4-1.2-wzd failed:

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

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-4.4-1.2-wzd 4.4-1.2-wzd
# Navigate to the new working tree
cd .worktrees/backport-4.4-1.2-wzd
# Create a new branch
git switch --create backport-4669-to-4.4-1.2-wzd
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 589dae5a20a9b5a738fae5ad782eb1d10dcee0c8
# Push it to GitHub
git push --set-upstream origin backport-4669-to-4.4-1.2-wzd
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-4.4-1.2-wzd

Then, create a pull request where the base branch is 4.4-1.2-wzd and the compare/head branch is backport-4669-to-4.4-1.2-wzd.

@github-actions
Copy link
Contributor

The backport to 4.4-7.10 failed:

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

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-4.4-7.10 4.4-7.10
# Navigate to the new working tree
cd .worktrees/backport-4.4-7.10
# Create a new branch
git switch --create backport-4669-to-4.4-7.10
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 589dae5a20a9b5a738fae5ad782eb1d10dcee0c8
# Push it to GitHub
git push --set-upstream origin backport-4669-to-4.4-7.10
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-4.4-7.10

Then, create a pull request where the base branch is 4.4-7.10 and the compare/head branch is backport-4669-to-4.4-7.10.

github-actions bot pushed a commit that referenced this pull request Oct 13, 2022
* [Backport 4.3-7.10] Create pull_request_template.md (#4591)

Create pull_request_template.md (#4583)

(cherry picked from commit aac7f22)

Co-authored-by: Álex <alejandro.ruiz.becerra@wazuh.com>

* Bump 4.3.9 (#4655)

* bump: Version v4.3.9-7.10.2

* bump: Version v4.3.9-7.10.2

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Federico Rodriguez <federico.rodriguez@wazuh.com>
Co-authored-by: Antonio David Gutiérrez <antonio.gutierrez@wazuh.com>
(cherry picked from commit 589dae5)
AlexRuiz7 added a commit that referenced this pull request Oct 13, 2022
Merge 4.3-7.10 into master (#4669)

* [Backport 4.3-7.10] Create pull_request_template.md (#4591)

Create pull_request_template.md (#4583)

(cherry picked from commit aac7f22)

Co-authored-by: Álex <alejandro.ruiz.becerra@wazuh.com>

* Bump 4.3.9 (#4655)

* bump: Version v4.3.9-7.10.2

* bump: Version v4.3.9-7.10.2

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Federico Rodriguez <federico.rodriguez@wazuh.com>
Co-authored-by: Antonio David Gutiérrez <antonio.gutierrez@wazuh.com>
(cherry picked from commit 589dae5)

Co-authored-by: Álex <alejandro.ruiz.becerra@wazuh.com>
AlexRuiz7 added a commit that referenced this pull request Oct 17, 2022
* [Backport 4.3-7.10] Create pull_request_template.md (#4591)

Create pull_request_template.md (#4583)

(cherry picked from commit aac7f22)

Co-authored-by: Álex <alejandro.ruiz.becerra@wazuh.com>

* Bump 4.3.9 (#4655)

* bump: Version v4.3.9-7.10.2

* bump: Version v4.3.9-7.10.2

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Federico Rodriguez <federico.rodriguez@wazuh.com>
Co-authored-by: Antonio David Gutiérrez <antonio.gutierrez@wazuh.com>
(cherry picked from commit 589dae5)
AlexRuiz7 added a commit that referenced this pull request Oct 17, 2022
* [Backport 4.3-7.10] Create pull_request_template.md (#4591)

Create pull_request_template.md (#4583)

(cherry picked from commit aac7f22)

Co-authored-by: Álex <alejandro.ruiz.becerra@wazuh.com>

* Bump 4.3.9 (#4655)

* bump: Version v4.3.9-7.10.2

* bump: Version v4.3.9-7.10.2

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Federico Rodriguez <federico.rodriguez@wazuh.com>
Co-authored-by: Antonio David Gutiérrez <antonio.gutierrez@wazuh.com>
(cherry picked from commit 589dae5)
AlexRuiz7 added a commit that referenced this pull request Oct 17, 2022
Merge 4.3-7.10 into master (#4669)

* [Backport 4.3-7.10] Create pull_request_template.md (#4591)

Create pull_request_template.md (#4583)

(cherry picked from commit aac7f22)

Co-authored-by: Álex <alejandro.ruiz.becerra@wazuh.com>

* Bump 4.3.9 (#4655)

* bump: Version v4.3.9-7.10.2

* bump: Version v4.3.9-7.10.2

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Federico Rodriguez <federico.rodriguez@wazuh.com>
Co-authored-by: Antonio David Gutiérrez <antonio.gutierrez@wazuh.com>
(cherry picked from commit 589dae5)
AlexRuiz7 added a commit that referenced this pull request Oct 17, 2022
Merge 4.3-7.10 into master (#4669)

* [Backport 4.3-7.10] Create pull_request_template.md (#4591)

Create pull_request_template.md (#4583)

(cherry picked from commit aac7f22)

Co-authored-by: Álex <alejandro.ruiz.becerra@wazuh.com>

* Bump 4.3.9 (#4655)

* bump: Version v4.3.9-7.10.2

* bump: Version v4.3.9-7.10.2

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Federico Rodriguez <federico.rodriguez@wazuh.com>
Co-authored-by: Antonio David Gutiérrez <antonio.gutierrez@wazuh.com>
(cherry picked from commit 589dae5)
AlexRuiz7 added a commit that referenced this pull request Oct 17, 2022
* [Backport 4.3-7.10] Create pull_request_template.md (#4591)

Create pull_request_template.md (#4583)

(cherry picked from commit aac7f22)

Co-authored-by: Álex <alejandro.ruiz.becerra@wazuh.com>

* Bump 4.3.9 (#4655)

* bump: Version v4.3.9-7.10.2

* bump: Version v4.3.9-7.10.2

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Federico Rodriguez <federico.rodriguez@wazuh.com>
Co-authored-by: Antonio David Gutiérrez <antonio.gutierrez@wazuh.com>
(cherry picked from commit 589dae5)
AlexRuiz7 added a commit that referenced this pull request Oct 17, 2022
* [Backport 4.3-7.10] Create pull_request_template.md (#4591)

Create pull_request_template.md (#4583)

(cherry picked from commit aac7f22)

Co-authored-by: Álex <alejandro.ruiz.becerra@wazuh.com>

* Bump 4.3.9 (#4655)

* bump: Version v4.3.9-7.10.2

* bump: Version v4.3.9-7.10.2

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Federico Rodriguez <federico.rodriguez@wazuh.com>
Co-authored-by: Antonio David Gutiérrez <antonio.gutierrez@wazuh.com>
(cherry picked from commit 589dae5)
AlexRuiz7 added a commit that referenced this pull request Oct 17, 2022
Merge 4.3-7.10 into master (#4669)

* [Backport 4.3-7.10] Create pull_request_template.md (#4591)

Create pull_request_template.md (#4583)

(cherry picked from commit aac7f22)

Co-authored-by: Álex <alejandro.ruiz.becerra@wazuh.com>

* Bump 4.3.9 (#4655)

* bump: Version v4.3.9-7.10.2

* bump: Version v4.3.9-7.10.2

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Federico Rodriguez <federico.rodriguez@wazuh.com>
Co-authored-by: Antonio David Gutiérrez <antonio.gutierrez@wazuh.com>
(cherry picked from commit 589dae5)
AlexRuiz7 added a commit that referenced this pull request Oct 17, 2022
* [Backport 4.3-7.10] Create pull_request_template.md (#4591)

Create pull_request_template.md (#4583)

(cherry picked from commit aac7f22)

Co-authored-by: Álex <alejandro.ruiz.becerra@wazuh.com>

* Bump 4.3.9 (#4655)

* bump: Version v4.3.9-7.10.2

* bump: Version v4.3.9-7.10.2

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Federico Rodriguez <federico.rodriguez@wazuh.com>
Co-authored-by: Antonio David Gutiérrez <antonio.gutierrez@wazuh.com>
(cherry picked from commit 589dae5)
AlexRuiz7 added a commit that referenced this pull request Oct 17, 2022
Merge 4.3-7.10 into master (#4669)

* [Backport 4.3-7.10] Create pull_request_template.md (#4591)

Create pull_request_template.md (#4583)

(cherry picked from commit aac7f22)

Co-authored-by: Álex <alejandro.ruiz.becerra@wazuh.com>

* Bump 4.3.9 (#4655)

* bump: Version v4.3.9-7.10.2

* bump: Version v4.3.9-7.10.2

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Federico Rodriguez <federico.rodriguez@wazuh.com>
Co-authored-by: Antonio David Gutiérrez <antonio.gutierrez@wazuh.com>
(cherry picked from commit 589dae5)
AlexRuiz7 added a commit that referenced this pull request Oct 17, 2022
Merge 4.3-7.10 into master (#4669)

* [Backport 4.3-7.10] Create pull_request_template.md (#4591)

Create pull_request_template.md (#4583)

(cherry picked from commit aac7f22)

Co-authored-by: Álex <alejandro.ruiz.becerra@wazuh.com>

* Bump 4.3.9 (#4655)

* bump: Version v4.3.9-7.10.2

* bump: Version v4.3.9-7.10.2

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Federico Rodriguez <federico.rodriguez@wazuh.com>
Co-authored-by: Antonio David Gutiérrez <antonio.gutierrez@wazuh.com>
(cherry picked from commit 589dae5)
@AlexRuiz7 AlexRuiz7 restored the 4.3-7.10 branch October 18, 2022 08:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants