Commit Graph

283 Commits

Author SHA1 Message Date
David Correa Rodríguez
9a871dbbcb Merge branch '4.5.3' into merge-4.5.3-into-4.6.0 2023-09-07 13:39:58 +02:00
David Correa Rodríguez
e5abd5d24e Bump to 4.5.3 2023-08-29 11:29:26 +02:00
Gonzalo Acuña
fc4cef1072 Merge pull request #900 from wazuh/merge-4.7.0-into-master
Merge `4.7.0` into `master`
2023-07-21 10:23:53 -03:00
Gonzalo Acuña
7d3bea67f7 Merge pull request #899 from wazuh/merge-4.6.0-into-4.7.0
Merge `4.6.0` into `4.7.0`
2023-07-21 10:07:45 -03:00
Gonzalo Acuña
f2dab81387 Merge branch '4.6.0' into merge-4.5.2-into-4.6.0 2023-07-21 08:15:57 -03:00
vcerenu
54975ab099 Bump to 4.5.2 2023-07-19 08:43:17 -03:00
vcerenu
919500bd74 bump master to 4.8.0 2023-07-14 16:22:52 -03:00
vcerenu
a0899a8358 resolving merge conflicts 2023-07-11 12:17:06 -03:00
vcerenu
4d0aa57ed2 resolving merge conflicts 2023-07-11 11:49:32 -03:00
vcerenu
247555b1b6 resolving merge conflicts 2023-07-11 11:21:00 -03:00
vcerenu
0f65448718 resolving merge conflicts 2023-07-11 09:41:16 -03:00
Gonzalo Acuña
55ee49aff5 Bumped to 4.4.5 2023-07-07 08:39:57 -03:00
vcerenu
39208c513c bump version 4.5.1 2023-06-26 13:35:29 -03:00
vcerenu
3650feeb0e bump version 4.5.0 2023-06-26 09:40:14 -03:00
vcerenu
8e3b8aada8 bump 4.6 version 2023-06-23 10:33:35 -03:00
vcerenu
6a98b87b8e bump 4.7 version 2023-06-22 17:26:55 -03:00
Gonzalo Acuña
56dbf052c9 Merge pull request #867 from wazuh/merge-4.5-into-master
Merge `4.5` into `master`
2023-06-14 16:36:31 -03:00
Gonzalo Acuña
303b64c7ae Merge branch '4.5' into merge-4.4.5-into-4.5 2023-06-14 15:16:14 -03:00
Gonzalo Acuña
41196a5529 Bump to 4.4.5 2023-06-05 11:44:32 -03:00
Gonzalo Acuña
e2e95a5c57 Bump to 4.4.4 2023-06-05 11:38:58 -03:00
Raul Del Pozo Moreno
f168bd62fe Merge remote-tracking branch 'origin/4.5' into master-merge-4.5 2023-05-29 16:36:14 +02:00
Raul Del Pozo Moreno
4e34f1f7b7 Merge remote-tracking branch 'origin/4.4' into 4.5-merge-4.4 2023-05-26 18:51:03 +02:00
Raul Del Pozo Moreno
820079f1d0 Bump to 4.4.3 2023-05-25 20:03:26 +02:00
Raul Del Pozo Moreno
f71616939e Merge remote-tracking branch 'origin/4.5' into merge-4.5-master 2023-05-18 22:43:04 +02:00
Raul Del Pozo Moreno
7427eff847 Added missing config 2023-05-18 22:14:26 +02:00
vcerenu
dd46f8a2c1 bump 4.6 version 2023-05-18 22:06:21 +02:00
vcerenu
697b7538cc bump release 4.5.0 2023-05-18 22:04:56 +02:00
vcerenu
638d548d74 bump 4.4.1 version 2023-05-18 22:04:21 +02:00
Gonzalo Acuña
944c6aa4c8 Revert "Bump 4.4 to 4.4.1" 2023-05-18 22:04:19 +02:00
vcerenu
5e3676e125 bump 4.4.1 version 2023-05-18 22:04:18 +02:00
Alberto R
3525003ef7 Bumped to 4.4.0 2023-05-18 22:03:03 +02:00
Gonzalo Acuña
00a94ce5b0 Bump to 4.2.6 2023-05-18 22:02:33 +02:00
Raul Del Pozo Moreno
e826236a28 Added missing config 2023-05-18 21:30:38 +02:00
vcerenu
312466704d bump release 4.5.0 2023-05-18 21:25:00 +02:00
vcerenu
42ea26b3bd bump 4.4.2 version 2023-05-18 21:24:15 +02:00
vcerenu
195b34c259 bump 4.3.11 version 2023-05-18 21:23:34 +02:00
vcerenu
cd7dc4c7cf bump 4.4.2 version 2023-05-18 21:05:41 +02:00
vcerenu
cd9f211eb3 bump 4.3.11 version 2023-05-18 21:04:31 +02:00
vcerenu
63ceab20b0 bump 4.3.11 version 2023-04-19 16:59:53 -03:00
vcerenu
8ada4445b0 bump 4.4.1 version 2023-04-10 10:20:48 -03:00
Gonzalo Acuña
f7bbac5a08 Revert "Bump 4.4 to 4.4.1" 2023-04-05 13:46:20 -03:00
vcerenu
a8de452002 bump 4.4.1 version 2023-03-31 10:27:58 -03:00
vcerenu
e9a0be25ce resolving conflicts in 4.3 merge 2022-11-30 15:27:48 -03:00
vcerenu
c1bfc450ba bump 4.3.10 version 2022-11-11 11:34:09 -03:00
vcerenu
fd08279f32 bump 4.3.9 version 2022-10-06 14:25:56 -03:00
vcerenu
22b77749fa bump 4.3.8 version 2022-09-12 15:37:47 -03:00
vcerenu
c278f6a503 bump 4.3.7 version 2022-08-12 12:02:04 -03:00
vcerenu
296de14886 bump 4.3.6 version 2022-07-18 10:25:01 -03:00
vcerenu
61791c1984 Bump 4.3.5 2022-06-23 15:36:27 -03:00
Alberto R
0520a771fe Bumped version 2022-06-08 10:10:23 +02:00