Gonzalo Acuña
|
b465a0ac9d
|
Merge branch '4.10.0' into merge-4.9.2-into-4.10.0
|
2024-11-04 15:33:19 -03:00 |
|
Carlos Anguita López
|
406fda2d2d
|
support new wazuh version v4.9.2
|
2024-10-25 11:46:36 +02:00 |
|
c-bordon
|
7d19eaa553
|
Bumped branch 4.10.2 to 4.10.2 version
|
2024-10-03 12:04:45 -03:00 |
|
JESUS D. GARCIA
|
f798ffcf9b
|
Bump missing references
|
2024-09-24 10:58:28 -05:00 |
|
Enrique Araque
|
c92bb0fa7d
|
Merge 4.9.1 into 4.10.0
|
2024-08-21 12:07:43 +02:00 |
|
Enrique Araque
|
e4d5f577f3
|
Merge 4.9.0 into 4.9.1
|
2024-08-21 11:55:28 +02:00 |
|
Enrique Araque
|
399b3dbb64
|
Merge 4.8.2 into 4.9.0
|
2024-08-21 11:31:42 +02:00 |
|
vcerenu
|
7d710aeea6
|
Fix changelog links
|
2024-08-19 11:24:04 -03:00 |
|
c-bordon
|
5fec0cb42c
|
Bump 4.8.2 branch to 4.8.2 version
|
2024-08-16 06:44:04 -03:00 |
|
David Correa Rodríguez
|
d4c0f88c71
|
Bump 4.9.1 version
|
2024-07-23 09:55:56 +02:00 |
|
vcerenu
|
4806423aa8
|
Bump 4.10.0 version
|
2024-06-19 10:37:11 -03:00 |
|
Gonzalo Acuña
|
5a33b8396a
|
Merge branch '4.9.0' into merge-4.8.1-into-4.9.0
|
2024-06-12 12:55:09 -03:00 |
|
Gonzalo Acuña
|
5a1ecc477b
|
Bump to 4.8.1
|
2024-06-04 11:53:31 -03:00 |
|
vcerenu
|
2e5bbf41ae
|
merge 4.8.0 into 4.9.0
|
2024-05-31 10:55:57 -03:00 |
|
Carlos Bordon
|
5720250826
|
Merge branch '4.8.0' into merge-4.7.5-into-4.8.0
|
2024-05-22 12:05:45 -03:00 |
|
Enrique Araque
|
e4c61578b3
|
Bump 4.7.5 version
|
2024-05-15 12:15:04 +02:00 |
|
Gonzalo Acuña
|
e028250f12
|
Merge branch '4.9.0' into merge-4.8.0-into-4.9.0
|
2024-04-30 10:05:04 -03:00 |
|
Carlos Anguita López
|
96987e35b1
|
merge 4.7.4 into 4.8.0
|
2024-04-30 14:13:49 +02:00 |
|
c-bordon
|
f19f81fbb9
|
Bump branch 4.7.4
|
2024-04-18 10:36:19 -03:00 |
|
Gonzalo Acuña
|
8a455224bb
|
Merge pull request #1231 from wazuh/merge-4.8.2-into-4.9.0
Merge 4.8.2 into 4.9.0
|
2024-03-01 15:41:49 -03:00 |
|
Gonzalo Acuña
|
0e426dcaae
|
Merge pull request #1230 from wazuh/merge-4.8.1-into-4.8.2
Merge 4.8.1 into 4.8.2
|
2024-03-01 14:43:42 -03:00 |
|
David Correa Rodríguez
|
1ead1ec354
|
Merge branch '4.8.0' into merge-4.8.0-into-4.8.1
|
2024-03-01 12:31:37 +01:00 |
|
David Correa Rodríguez
|
7422e5790a
|
Merge branch '4.7.3' into merge-4.7.3-into-4.8.0
|
2024-02-23 10:55:37 +01:00 |
|
vcerenu
|
8660b5b1ca
|
bump 4.7.3 version
|
2024-02-19 05:34:37 -03:00 |
|
Gonzalo Acuña
|
e9432d06db
|
Merge branch 'master' into merge-4.8.2-into-master
|
2024-01-04 14:52:39 -03:00 |
|
Gonzalo Acuña
|
acc2d6c812
|
Bump to 4.8.2
|
2024-01-04 10:01:08 -03:00 |
|
David Correa Rodríguez
|
7451cf6f2d
|
Merge branch '4.8.1' into merge-4.8.1-into-master
|
2023-12-20 19:02:22 +01:00 |
|
David Correa Rodríguez
|
d4703d2615
|
Merge branch '4.8.0' into merge-4.8.0-into-4.8.1
|
2023-12-20 18:38:18 +01:00 |
|
David Correa Rodríguez
|
5a25f1c625
|
Merge branch '4.7.2' into merge-4.7.2-into-4.8.0
|
2023-12-20 18:21:30 +01:00 |
|
vcerenu
|
f591e37104
|
bump revision number
|
2023-11-30 05:58:24 -03:00 |
|
David Correa Rodríguez
|
20c03c32f4
|
Merge branch '4.8.1' into merge-4.8.1-into-master
|
2023-11-27 18:18:42 +01:00 |
|
David Correa Rodríguez
|
83c4bc81a5
|
Bump version to 4.8.1
|
2023-11-22 11:11:53 +01:00 |
|
David Correa Rodríguez
|
981de43eee
|
Merge branch '4.8.0' into merge-4.8.0-into-master
|
2023-10-23 10:39:16 +02:00 |
|
David Correa Rodríguez
|
fa5dffd9b0
|
Merge branch '4.7.1' into merge-4.7.1-into-4.8.0
|
2023-10-23 10:30:43 +02:00 |
|
David Correa Rodríguez
|
77e44c105b
|
Merge branch '4.7.0' into merge-4.7.0-into-4.7.1
|
2023-10-23 10:19:19 +02:00 |
|
David Correa Rodríguez
|
2fb6172cfa
|
Merge branch '4.6.0' into merge-4.6.0-into-4.7.0
|
2023-10-23 10:10:59 +02:00 |
|
David Correa Rodríguez
|
9bffdbe93c
|
Added v4.5.4 to CHANGELOG.md
|
2023-10-23 09:52:38 +02:00 |
|
David Correa Rodríguez
|
7ba6543071
|
Updated CHANGELOG.md
|
2023-10-13 14:04:09 +02:00 |
|
David Correa Rodríguez
|
d1e9c30ca1
|
Bump version to 4.9.0
|
2023-10-13 13:25:02 +02:00 |
|
David Correa Rodríguez
|
237a5de1c8
|
Added empty line in CHANGELOG.md
|
2023-09-22 12:48:59 +02:00 |
|
David Correa Rodríguez
|
c1bcd06057
|
Merge remote-tracking branch 'origin/4.7.1' into merge-4.7.1-into-master
|
2023-09-22 12:39:45 +02:00 |
|
David Correa Rodríguez
|
035bf984c8
|
Bump version to 4.7.1
|
2023-09-20 11:08:28 +02:00 |
|
David Correa Rodríguez
|
2c128f9ab0
|
Merge branch '4.7.0' into merge-4.7.0-into-master
|
2023-09-07 16:21:42 +02:00 |
|
David Correa Rodríguez
|
aeff17a189
|
Merge branch '4.6.0' into merge-4.6.0-into-4.7.0
|
2023-09-07 14:41:11 +02:00 |
|
Gonzalo Acuña
|
6bb6e713ee
|
Merge branch '4.6.0' into merge-4.5.3-into-4.6.0
|
2023-08-31 14:45:17 -03:00 |
|
David Correa Rodríguez
|
3bc97dfac7
|
Bumo to 4.5.3
|
2023-08-29 11:19:22 +02:00 |
|
Gonzalo Acuña
|
dbcb7d0fc3
|
Merge pull request #960 from wazuh/merge-4.7.0-into-master
Merge `4.7.0` into `master`
|
2023-07-21 09:25:00 -03:00 |
|
Gonzalo Acuña
|
ed826928f4
|
Merge pull request #959 from wazuh/merge-4.6.0-into-4.7.0
Merge `4.6.0` into `4.7.0`
|
2023-07-21 08:50:16 -03:00 |
|
Gonzalo Acuña
|
50ef29b080
|
Merge branch '4.6.0' into merge-4.5.2-into-4.6.0
|
2023-07-21 08:06:26 -03:00 |
|
Gonzalo Acuña
|
3da2b23a5b
|
Bump to 4.5.2
|
2023-07-19 08:34:52 -03:00 |
|
vcerenu
|
5ef3d1cc3e
|
bump master to 4.8.0
|
2023-07-14 16:17:53 -03:00 |
|
c-bordon
|
0f923fea35
|
Merge 4.6.0 into master
|
2023-07-11 11:56:23 -03:00 |
|
c-bordon
|
a15655ae71
|
Merge 4.5.1 into 4.6.0
|
2023-07-11 11:25:27 -03:00 |
|
c-bordon
|
14cd098782
|
merge 4.5.0 with 4.5.1
|
2023-07-11 11:02:23 -03:00 |
|
c-bordon
|
6d10eeb9a3
|
Merge 4.4 into 4.5.0
|
2023-07-11 10:36:02 -03:00 |
|
vcerenu
|
97517742a0
|
bump version 4.5.1
|
2023-06-26 13:26:37 -03:00 |
|
vcerenu
|
6192220d14
|
bump version 4.5.0
|
2023-06-26 09:48:45 -03:00 |
|
c-bordon
|
247337badb
|
Bump 4.6.0 to 4.6.0 branch
|
2023-06-23 12:40:11 -03:00 |
|
Gonzalo Acuña
|
e8a11e98f8
|
Merge branch '4.5' into merge-4.4.5-into-4.5
|
2023-06-14 15:13:59 -03:00 |
|
c-bordon
|
8181ee8b91
|
Partial bump to 4.4.5, update of md5 Windows is needed
|
2023-06-06 09:14:46 -03:00 |
|
c-bordon
|
1456e51500
|
Partial bump to 4.4.4, update of md5 Windows is needed
|
2023-06-06 09:11:41 -03:00 |
|
Raul Del Pozo Moreno
|
fddd0260b9
|
Merge remote-tracking branch 'origin/4.4' into 4.5-merge-4.4
|
2023-05-29 19:02:52 +02:00 |
|
Raul Del Pozo Moreno
|
7043b653d5
|
Bump to 4.4.3
|
2023-05-25 21:55:28 +02:00 |
|
Gonzalo Acuña
|
d34b9acaae
|
Conflicts resolution
|
2023-05-18 12:14:00 -03:00 |
|
vcerenu
|
776d84a219
|
merge 4.4 to 4.5
|
2023-04-28 16:35:27 -03:00 |
|
vcerenu
|
441100d847
|
bump 4.4.2 version
|
2023-04-28 16:20:29 -03:00 |
|
vcerenu
|
e228ead890
|
resolving conflicts between branchs
|
2023-04-28 14:33:06 -03:00 |
|
vcerenu
|
a875ab96cd
|
bump 4.3.11 version
|
2023-04-19 16:59:19 -03:00 |
|
Gonzalo Acuña
|
0e15256486
|
Bumped to 4.4.1
|
2023-03-31 10:25:55 -03:00 |
|
Gonzalo Acuña
|
6952a17eca
|
Conflicts resolved
|
2023-02-01 10:47:03 -03:00 |
|
Gonzalo Acuña
|
49d1205e7f
|
Conflicts resolved
|
2023-02-01 09:08:19 -03:00 |
|
vcerenu
|
3fb1f933db
|
bump 4.3.10 version
|
2022-11-11 11:40:06 -03:00 |
|
Gonzalo Acuña
|
ea00a465b8
|
Merge 4.3 into 4.4
|
2022-10-21 08:45:01 -03:00 |
|
Gonzalo Acuña
|
6607cea7f4
|
Merge branch 'master' into merge-43-master
|
2022-10-12 09:22:38 -03:00 |
|
Gonzalo Acuña
|
034d502b46
|
Bump to 4.3.9
|
2022-09-27 14:52:05 -03:00 |
|
Gonzalo Acuña
|
1250f3a166
|
Merge branch '4.4' into merge-4.3-to-4.4
|
2022-09-15 14:47:48 -03:00 |
|
Gonzalo Acuña
|
e354d33ce9
|
Bump to 4.3.8
|
2022-09-12 09:43:58 -03:00 |
|
Gonzalo Acuña
|
d0327844bc
|
Bump to 4.3.7
|
2022-08-12 12:51:13 -03:00 |
|
Gonzalo Acuña
|
a1b7fa0562
|
Merge 4.3.6 into master (conflicts)
|
2022-07-22 12:32:37 -03:00 |
|
Gonzalo Acuña
|
dcdcb4d8b4
|
Bump to 4.3.6
|
2022-07-18 10:04:58 -03:00 |
|
Gonzalo Acuña
|
25e68f53d8
|
Bump to 4.3.5
|
2022-06-23 15:13:52 -03:00 |
|
Alberto R
|
e9e56ff248
|
Bumped version
|
2022-06-08 10:26:39 +02:00 |
|
Gonzalo Acuña
|
91e5449520
|
Conflicts resolution
|
2022-06-01 12:51:27 -03:00 |
|
Gonzalo Acuña
|
0b1114ef5e
|
Conflicts resolution
|
2022-06-01 12:39:24 -03:00 |
|
Gonzalo Acuña
|
76de7a5c14
|
Bump to 4.4.0
|
2022-06-01 12:25:12 -03:00 |
|
Gonzalo Acuña
|
c515b36cbc
|
Bump to 4.3.3
|
2022-05-31 09:35:10 -03:00 |
|
Gonzalo Acuña
|
94ee101dde
|
Bump 4.3 to 4.3.2
|
2022-05-30 10:34:06 -03:00 |
|
Gonzalo Acuña
|
2251a857e1
|
Bump master to 4.5
|
2022-05-20 15:03:16 -03:00 |
|
Gonzalo Acuña
|
7102ba7128
|
Conflicts resolution (4.3 to master)
|
2022-05-20 11:05:57 -03:00 |
|
José Fernández
|
3d762e34a6
|
Bumped 4.3 to 4.3.1 version
|
2022-05-16 10:35:09 +02:00 |
|
Alberto Rodríguez
|
bfd7e8bafc
|
Update CHANGELOG.md
Co-authored-by: José Fernández Aguilera <jose.fernandez@wazuh.com>
|
2022-03-28 16:59:51 +02:00 |
|
Gonzalo Acuña
|
97ea3f0078
|
Merge branch 'master' into 4.2-merge-master
|
2022-03-28 11:21:25 -03:00 |
|
c-bordon
|
3b8730d9b1
|
4.2.6 Bump
|
2022-03-25 10:23:05 -03:00 |
|
Alberto R
|
84291baa97
|
Bumped to 4.4.0
|
2021-11-24 17:10:24 +01:00 |
|
Nicolas Lastra
|
bb95ea167c
|
merge 4.2.5 in master
|
2021-11-16 11:35:56 -03:00 |
|
Nicolas Lastra
|
a0116db707
|
bump 4.2.5
|
2021-11-15 11:26:56 -03:00 |
|
Nicolas Lastra
|
0d2d63271a
|
645-tag4.2.4-to-master
|
2021-10-20 18:02:37 -03:00 |
|
Nicolas Lastra
|
37b57b8088
|
fix url and task
|
2021-10-15 13:42:03 -03:00 |
|
Nicolas Lastra
|
3afe577d91
|
bump 4.2.4
|
2021-10-14 18:08:02 -03:00 |
|
Nicolas Lastra
|
b7e900245e
|
637-merge-tag4.2-to-master
|
2021-10-12 23:28:59 -03:00 |
|
Nicolas Lastra
|
c829d67136
|
636-bump-4.2.3-t0-4.2
|
2021-10-06 12:28:45 -03:00 |
|
Nicolas Lastra
|
dfb1a8e9f9
|
fix url in changelog
|
2021-10-01 12:41:20 -03:00 |
|
Nicolas Lastra
|
4b774dfeb3
|
merge de 4.2 a master
|
2021-10-01 12:24:53 -03:00 |
|
Nicolas Lastra
|
f55390c527
|
4.2.2 tag update
|
2021-09-14 15:56:49 -03:00 |
|
Nicolas Lastra
|
29e84158a9
|
4.2.1 tag update
|
2021-09-09 15:13:25 -03:00 |
|
Víctor Moreno Jiménez
|
151d508671
|
Merge branch 'master' into 4.3
|
2021-04-21 08:17:44 +02:00 |
|
Víctor Moreno Jiménez
|
1216fc3e7b
|
Merge branch '4.1' into master
|
2021-04-21 08:15:24 +02:00 |
|
VictorMorenoJimenez
|
4b6105fd3d
|
Bump to v4.3.0
|
2021-04-14 08:04:11 +02:00 |
|
VictorMorenoJimenez
|
38c4942ee8
|
Bump to v4.2.0
|
2021-04-13 16:21:17 +02:00 |
|
Victor Moreno Jimenez
|
013e7ab4fa
|
Bump to v4.1.4
|
2021-03-26 08:33:58 +01:00 |
|
Victor Moreno Jimenez
|
bbaa898e90
|
Bump to 4.1.3
|
2021-03-23 16:19:46 +01:00 |
|
Alberto Rodríguez
|
ef94835bab
|
Update CHANGELOG.md
Co-authored-by: Víctor Moreno Jiménez <victor.moreno@wazuh.com>
|
2021-03-09 18:43:44 +01:00 |
|
Alberto R
|
82547c0c86
|
4.1.2 Bump
|
2021-03-08 17:14:56 +01:00 |
|
Sergio García
|
f357e20493
|
CHANGELOG.md: add new feautures in v4.1.1
|
2021-03-04 20:31:10 +01:00 |
|
zenidd
|
f479408d46
|
release: update CHANGELOG for v4.0.4
|
2021-01-15 11:49:09 +01:00 |
|
zenidd
|
f7c84a357d
|
release: update CHANGELOG for v4.0.4
|
2021-01-15 10:24:18 +01:00 |
|
neonmei
|
148e0478e9
|
release: update CHANGELOG for v4.0.4
|
2021-01-11 11:15:47 -03:00 |
|
neonmei
|
8d565de581
|
release: update CHANGELOG.md for v4.0.3
|
2020-11-30 13:03:32 -03:00 |
|
neonmei
|
2501ee6624
|
release: update CHANGELOG.md for v4.0.2
|
2020-11-25 11:02:30 -03:00 |
|
neonmei
|
333816831a
|
release: bump Wazuh version to 4.0.2
|
2020-11-23 17:17:04 -03:00 |
|
zenidd
|
277df071bd
|
include latest PR on release
|
2020-11-16 17:14:58 +01:00 |
|
zenidd
|
158750c9a8
|
Changelog update
|
2020-11-13 17:06:11 +01:00 |
|
zenidd
|
dac3ddc1fb
|
wazuh-ansible: bump versions, update README
|
2020-11-13 10:57:20 +01:00 |
|
zenidd
|
9870df0917
|
Update changelog
|
2020-10-23 17:17:35 +02:00 |
|
zenidd
|
583f38f19c
|
Merge master changes
|
2020-10-20 17:44:26 +02:00 |
|
zenidd
|
5ad76a1e36
|
Bump versions
|
2020-10-20 17:40:28 +02:00 |
|
zenidd
|
707aad76ad
|
Bump to Wazuh version v3.13.2
|
2020-09-18 15:06:21 +02:00 |
|
Manuel J. Bernal
|
7093ea433b
|
Bump version
|
2020-07-14 17:04:48 +02:00 |
|
Manuel J. Bernal
|
970b03a9f2
|
Bump version
|
2020-07-14 12:53:55 +02:00 |
|
Zenidd
|
d907793953
|
Bump to version v3.13.0_7.7.1
|
2020-06-23 16:51:53 +02:00 |
|
Jose M
|
6b36e63f1c
|
Update CHANGELOG.md
|
2020-04-30 12:23:09 +02:00 |
|
Zenidd
|
ae52e6fa1f
|
Removing v3.12.1 from changelog
|
2020-04-13 11:05:12 +02:00 |
|
Zenidd
|
0c328081e7
|
Bump version to 3.12.2-7.6.2
|
2020-04-13 10:35:12 +02:00 |
|
Manuel J. Bernal
|
6b3f04f32c
|
Bump version
|
2020-04-08 19:56:44 +02:00 |
|
Zenidd
|
f518635a11
|
Changelog minor fix
|
2020-03-25 18:20:30 +01:00 |
|
Zenidd
|
ec9a4b61c7
|
v3.12 changelog
|
2020-03-25 17:57:38 +01:00 |
|
Manuel J. Bernal
|
3f0e032580
|
Bump version
|
2020-03-05 16:44:02 +01:00 |
|
Jose M
|
a400138eb0
|
Update CHANGELOG.md
|
2020-01-28 12:15:35 +01:00 |
|
Jose M
|
87b485e510
|
Update CHANGELOG.md
|
2020-01-28 12:09:38 +01:00 |
|
Jose M
|
7f86bbe765
|
Update CHANGELOG.md
|
2020-01-22 13:33:54 +01:00 |
|
Manuel Gutierrez
|
78a08db91c
|
Merge branch 'devel' into wazuh-release-v3.11.1_7.5.1
|
2020-01-08 17:20:56 +01:00 |
|
Jose M. Garcia
|
5c7590d632
|
Merge pull request #335 from wazuh/feature-332-default-installation
Changes to make `ossec.conf` equivalent to the default version
|
2020-01-08 17:18:12 +01:00 |
|
Manuel Gutierrez
|
a708328028
|
Merge branch 'master' into wazuh-release-v3.11.1_7.5.1
|
2020-01-08 16:24:44 +01:00 |
|
Jose M
|
b050291a23
|
Update CHANGELOG.md
|
2020-01-08 14:23:14 +01:00 |
|
Rshad Zhran
|
bfc39c1572
|
Merge branch 'devel' into feature-332-default-installation
|
2020-01-07 17:59:46 +01:00 |
|
Manuel Gutierrez
|
0d23ca8b01
|
Update CHANGELOG.md
|
2020-01-07 17:08:56 +01:00 |
|
Jose M
|
bfe86ed1d3
|
Update CHANGELOG.md
|
2019-12-26 13:13:32 +01:00 |
|
Rshad Zhran
|
760057583c
|
Bump version to wazuh 3.11.0
|
2019-12-17 14:15:16 +01:00 |
|
Jose M. Garcia
|
6050c84046
|
Merge branch 'devel' into feature-303-flex-app-url
|
2019-11-06 09:18:54 +01:00 |
|
Jose M. Garcia
|
451a74d94d
|
Merge branch 'devel' into feature-300-add-agent-restart
|
2019-11-05 17:07:53 +01:00 |
|