Update references of 'master' branch to 'main' #979
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
7 tasks
c-bordon
approved these changes
Feb 11, 2025
kurarrr
added a commit
to kurarrr/wazuh-kubernetes
that referenced
this pull request
Sep 22, 2025
commit ec4b316 Merge: 0c6b85d aabc8fa Author: George Gaál <[email protected]> Date: Sat Mar 1 14:36:03 2025 +0100 Merge branch 'wazuh:main' into master commit aabc8fa Merge: 96b03b9 9304f98 Author: Carlos Bordon <[email protected]> Date: Wed Feb 19 12:06:57 2025 -0300 Merge pull request wazuh#987 from wazuh/change/981-cherry-pick-version-file-standardization Standardize version file format (cherry-pick to main) commit 9304f98 Author: vcerenu <[email protected]> Date: Mon Feb 17 13:30:13 2025 -0300 Standardize version file format to VERSION.json commit 96b03b9 Merge: b9e2a67 9f8d1ea Author: Carlos Bordon <[email protected]> Date: Tue Feb 11 12:32:32 2025 -0300 Merge pull request wazuh#979 from wazuh/enhancement/972-rename-master-branch-to-main Update references of 'master' branch to 'main' commit 9f8d1ea Author: Jesus Garcia <[email protected]> Date: Tue Feb 11 10:09:27 2025 -0500 Update references of 'master' branch to 'main' commit b9e2a67 Merge: 6eb022c 8549926 Author: Gonzalo Acuña <[email protected]> Date: Wed Nov 27 15:47:14 2024 -0300 Merge pull request wazuh#896 from wazuh/enhancement/878-workflow-test-k8s New PR Checks commit 8549926 Author: vcerenu <[email protected]> Date: Thu Nov 21 06:59:42 2024 -0300 Add Free disk space action commit b111938 Author: vcerenu <[email protected]> Date: Wed Nov 20 10:59:59 2024 -0300 Add Changelog commit 7d73198 Author: vcerenu <[email protected]> Date: Tue Nov 19 13:04:01 2024 -0300 Add a newline commit bf32d12 Author: vcerenu <[email protected]> Date: Tue Nov 19 09:14:34 2024 -0300 Change region commit 375081c Author: vcerenu <[email protected]> Date: Thu Nov 14 10:36:47 2024 -0300 Change volume filter commit 10f073f Author: vcerenu <[email protected]> Date: Thu Nov 14 09:35:10 2024 -0300 Uncomment delete command commit f0c253c Author: vcerenu <[email protected]> Date: Thu Nov 14 08:46:22 2024 -0300 Fix filter name commit 1a4089f Author: vcerenu <[email protected]> Date: Thu Nov 14 08:05:14 2024 -0300 Add a function for delete all volumes used commit 04be563 Author: vcerenu <[email protected]> Date: Wed Nov 13 14:38:21 2024 -0300 Change env varaibles commit 336a4df Author: vcerenu <[email protected]> Date: Wed Nov 13 13:43:23 2024 -0300 Modify cluster name commit da3e287 Author: vcerenu <[email protected]> Date: Wed Nov 13 13:01:53 2024 -0300 Modify cluster name commit f96fd04 Author: vcerenu <[email protected]> Date: Wed Nov 13 11:26:59 2024 -0300 Add minikube tunnel command commit 9f835fb Author: vcerenu <[email protected]> Date: Mon Nov 11 10:35:52 2024 -0300 Add apt update commit 1d033ce Author: vcerenu <[email protected]> Date: Mon Nov 11 10:13:43 2024 -0300 Delete docker rmi command commit eaf85f9 Author: vcerenu <[email protected]> Date: Mon Nov 11 10:10:21 2024 -0300 Change Ubuntu version commit 5da3eff Author: vcerenu <[email protected]> Date: Fri Nov 8 15:44:35 2024 -0300 Change wait time commit cf36192 Author: vcerenu <[email protected]> Date: Fri Nov 8 14:57:47 2024 -0300 Add protocol and port commit 09f7319 Author: vcerenu <[email protected]> Date: Fri Nov 8 13:21:27 2024 -0300 Add protocol and port commit 1b01a19 Author: vcerenu <[email protected]> Date: Fri Nov 8 12:56:50 2024 -0300 Add protocol and port commit e6dee26 Author: vcerenu <[email protected]> Date: Fri Nov 8 10:31:52 2024 -0300 Add tests for k8s cluster commit 7a24692 Author: vcerenu <[email protected]> Date: Thu Nov 7 06:52:06 2024 -0300 Change role name commit 8bbc40f Author: vcerenu <[email protected]> Date: Wed Nov 6 14:22:31 2024 -0300 Add wait and status commit 08f2faf Author: vcerenu <[email protected]> Date: Wed Nov 6 13:25:43 2024 -0300 Add wait and status commit 17f2c8e Author: vcerenu <[email protected]> Date: Wed Nov 6 13:19:42 2024 -0300 Fix cluster name commit 6c1140e Author: vcerenu <[email protected]> Date: Wed Nov 6 13:14:56 2024 -0300 add delete eks cluster commit dc2a928 Author: vcerenu <[email protected]> Date: Wed Nov 6 11:07:02 2024 -0300 test minikube commit d3edfdc Author: vcerenu <[email protected]> Date: Wed Nov 6 10:20:40 2024 -0300 Add new env variable commit 6eb022c Merge: 36a39c5 befa99f Author: Gonzalo Acuña <[email protected]> Date: Wed Nov 6 09:12:28 2024 -0300 Merge pull request wazuh#889 from wazuh/enhancement/878-change-secret Change secret name commit befa99f Author: vcerenu <[email protected]> Date: Wed Nov 6 09:06:15 2024 -0300 Change secret name commit 36a39c5 Merge: baea8bb 9101a01 Author: Gonzalo Acuña <[email protected]> Date: Wed Nov 6 08:58:19 2024 -0300 Merge pull request wazuh#888 from wazuh/enhancement/878-test-workflow Add PR test workflow for Kubernetes commit 9101a01 Author: vcerenu <[email protected]> Date: Wed Nov 6 08:56:26 2024 -0300 delete pull_request option before complete the issue commit 26a657e Author: vcerenu <[email protected]> Date: Wed Nov 6 08:51:23 2024 -0300 Add PR test workflow for Kubernetes commit baea8bb Merge: 2130b57 d96ee5b Author: Carlos Bordon <[email protected]> Date: Mon Nov 4 16:47:59 2024 -0300 Merge pull request wazuh#885 from wazuh/merge-4.10.2-into-master Merge 4.10.2 into master commit 2130b57 Merge: 045f0d5 df240f2 Author: Gonzalo Acuña <[email protected]> Date: Thu Oct 17 13:03:39 2024 -0300 Merge pull request wazuh#862 from wazuh/merge-4.10.2-into-master Merge 4.10.2 into master commit df240f2 Merge: 045f0d5 a9fde41 Author: JESUS D. GARCIA <[email protected]> Date: Thu Oct 17 10:59:17 2024 -0500 Merge branch '4.10.2' into merge-4.10.2-into-master commit 0c6b85d Author: George Gaál <[email protected]> Date: Sat Oct 5 22:40:00 2024 +0200 fix the issue with certificates on managers Signed-off-by: George Gaál <[email protected]> commit 1828ed2 Author: George Gaal <[email protected]> Date: Thu Feb 1 20:20:00 2024 +0100 PoC of managing certificates with cert-manager bases on Docker Desktop Signed-off-by: George Gaál <[email protected]> commit 045f0d5 Merge: 3f5335a c4ebb13 Author: Gonzalo Acuña <[email protected]> Date: Thu Sep 5 14:13:53 2024 -0300 Merge pull request wazuh#813 from wazuh/enhancement/810-merge-4.10.0-into-master Merge 4.10.0 into master commit 3f5335a Merge: bc05fdb c1d855b Author: David Correa Rodríguez <[email protected]> Date: Wed Aug 21 12:48:14 2024 +0200 Merge pull request wazuh#799 from wazuh/merge-4.10.0-into-master Merge 4.10.0 into master commit c1d855b Merge: bc05fdb 4c2590d Author: David Correa Rodríguez <[email protected]> Date: Wed Aug 21 12:25:31 2024 +0200 Merge branch '4.10.0' into merge-4.10.0-into-master commit bc05fdb Merge: 9fda79d 8144c39 Author: Carlos Bordon <[email protected]> Date: Fri Jul 19 10:46:25 2024 -0300 Merge pull request wazuh#772 from wazuh/merge-4.10.0-into-master Merge 4.10.0 into master commit 8144c39 Merge: 02e391d 9fda79d Author: David Correa Rodríguez <[email protected]> Date: Fri Jul 19 15:45:59 2024 +0200 Merge branch 'master' into merge-4.10.0-into-master commit 9fda79d Merge: 57a3e4a 4606b78 Author: Carlos Bordon <[email protected]> Date: Fri Jul 19 10:45:34 2024 -0300 Merge pull request wazuh#773 from wazuh/revert-764-maintenance/761-revert-merge-4.9.0-into-master Revert "Revert "Merge branch '4.9.0' into merge-4.9.0-into-master"" commit 4606b78 Author: Carlos Bordon <[email protected]> Date: Fri Jul 19 10:45:01 2024 -0300 Revert "Revert "Merge branch '4.9.0' into merge-4.9.0-into-master"" commit 02e391d Merge: 57a3e4a 3f5d27b Author: David Correa Rodríguez <[email protected]> Date: Fri Jul 19 13:07:15 2024 +0200 Merge branch '4.10.0' into merge-4.10.0-into-master commit 57a3e4a Merge: 2571d3b f207ad8 Author: David Correa Rodríguez <[email protected]> Date: Fri Jul 19 11:18:14 2024 +0200 Merge pull request wazuh#764 from wazuh/maintenance/761-revert-merge-4.9.0-into-master Revert "Merge branch '4.9.0' into merge-4.9.0-into-master" commit f207ad8 Author: David Correa Rodríguez <[email protected]> Date: Fri Jul 19 09:47:27 2024 +0200 Revert "Merge branch '4.9.0' into merge-4.9.0-into-master" This reverts commit 56c64a6, reversing changes made to eedc893. commit 2571d3b Merge: eedc893 56c64a6 Author: David Correa Rodríguez <[email protected]> Date: Thu Jul 18 15:03:22 2024 +0200 Merge pull request wazuh#763 from wazuh/merge-4.9.0-into-master Merge 4.9.0 into master commit 56c64a6 Merge: eedc893 feb0dc4 Author: David Correa Rodríguez <[email protected]> Date: Thu Jul 18 14:46:26 2024 +0200 Merge branch '4.9.0' into merge-4.9.0-into-master commit eedc893 Merge: 2c7c033 24034b9 Author: Gonzalo Acuña <[email protected]> Date: Wed Jun 12 12:55:58 2024 -0300 Merge pull request wazuh#717 from wazuh/merge-4.9.0-into-master Merge 4.9.0 into master commit 2c7c033 Merge: 29400c3 a86f963 Author: Gonzalo Acuña <[email protected]> Date: Fri May 31 12:42:40 2024 -0300 Merge pull request wazuh#704 from wazuh/701-merge-4.9.0-into-master Merge 4.9.0 into master commit a86f963 Merge: 35f40e2 29400c3 Author: vcerenu <[email protected]> Date: Fri May 31 12:04:30 2024 -0300 Merge branch 'master' of github.com:wazuh/wazuh-kubernetes into 4.9.0 commit 29400c3 Merge: f455225 df51bdb Author: Gonzalo Acuña <[email protected]> Date: Tue Apr 30 08:21:24 2024 -0300 Merge pull request wazuh#666 from wazuh/merge-4.9.0-into-master Merge 4.9.0 into master commit f455225 Merge: 1bcd18b 33f5105 Author: David Correa Rodríguez <[email protected]> Date: Mon Apr 1 11:31:16 2024 +0200 Merge pull request wazuh#634 from wazuh/merge-4.9.0-into-master Merge 4.9.0 into master commit 33f5105 Merge: d235d86 4ef8ea0 Author: David Correa Rodríguez <[email protected]> Date: Mon Apr 1 11:11:14 2024 +0200 Merge branch '4.9.0' into merge-4.9.0-into-master commit 1bcd18b Merge: d235d86 56b80eb Author: Gonzalo Acuña <[email protected]> Date: Mon Mar 4 13:47:30 2024 -0300 Merge pull request wazuh#621 from wazuh/merge-4.9.0-into-master Merge 4.9.0 into master commit 56b80eb Merge: d235d86 665235b Author: David Correa Rodríguez <[email protected]> Date: Mon Mar 4 17:44:19 2024 +0100 Merge branch '4.9.0' into merge-4.9.0-into-master commit d235d86 Merge: 6704d78 2a49a0c Author: Gonzalo Acuña <[email protected]> Date: Fri Mar 1 15:55:06 2024 -0300 Merge pull request wazuh#615 from wazuh/merge-4.9.0-into-master Merge 4.9.0 into master commit 6704d78 Merge: 49a91ae 4907b59 Author: David Correa Rodríguez <[email protected]> Date: Tue Feb 13 11:11:00 2024 +0100 Merge pull request wazuh#588 from wazuh/bump-5.0.0 Bump version to 5.0.0 commit 4907b59 Author: David Correa Rodríguez <[email protected]> Date: Tue Feb 13 11:09:03 2024 +0100 Bump version to 5.0.0
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
This PR updates the references of the branch
mastertomainRelated issue
masterbranch tomain| wazuh-kubernetes #972