 Alberto Rodríguez
|
9cd399c2df
|
Merge pull request #598 from wazuh/4.2-merge_master
Merge 4.2 into master
|
2022-03-28 16:58:01 +02:00 |
|
|
Gonzalo Acuña
|
3e54eeb62f
|
Merge branch 'master' into 4.2-merge_master
|
2022-03-28 11:34:55 -03:00 |
|
|
Alberto Rodríguez
|
a4be008028
|
Merge pull request #596 from wazuh/595-bump_426
Bump to 4.2.6
v4.2.6
|
2022-03-28 15:49:25 +02:00 |
|
|
Gonzalo Acuña
|
85e62cfd0e
|
Bump to 4.2.6
|
2022-03-25 10:28:14 -03:00 |
|
|
Alberto R
|
84fe19e868
|
Bumped to 4.4.0
|
2021-11-24 17:01:09 +01:00 |
|
|
Gonzalo Acuña
|
eebbdae82e
|
Merge pull request #555 from wazuh/4.2.5-into-master
Merge 4.2.5 into master
|
2021-11-16 16:23:58 -03:00 |
|
|
vcerenu
|
970658f81c
|
Resolving conflicts in merge
|
2021-11-16 12:54:49 -03:00 |
|
|
José Fernández Aguilera
|
5cabaa4700
|
Merge pull request #553 from wazuh/10842-release-4.2.5
Update release 4.2.5
v4.2.5
|
2021-11-15 20:12:48 +01:00 |
|
|
vcerenu
|
603e48237b
|
Bump release 4.2.5
|
2021-11-15 11:48:03 -03:00 |
|
|
vcerenu
|
71628e1575
|
Bump release 4.2.5
|
2021-11-15 11:47:20 -03:00 |
|
|
vcerenu
|
a5d13c9fc6
|
Bump release 4.2.5
|
2021-11-15 10:35:40 -03:00 |
|
|
Gonzalo Acuña
|
a9442d7345
|
Merge pull request #544 from wazuh/507-permanent-folder
Fix directory problem in permanent_data
|
2021-11-05 08:28:08 -03:00 |
|
|
vcerenu
|
f02697786c
|
fix directory problem in permanent_data
|
2021-11-04 16:00:09 -03:00 |
|
|
Gonzalo Acuña
|
d530faa8f3
|
Merge pull request #543 from wazuh/507-permanent-folder
Add /var/ossec/logs/archives to permanent_data
|
2021-11-04 12:16:05 -03:00 |
|
|
vcerenu
|
898f699d85
|
507 - add /var/ossec/logs/archives to permanent_data
|
2021-11-04 11:05:04 -03:00 |
|
|
Gonzalo Acuña
|
6008492dd7
|
Merge pull request #539 from wazuh/merge-4.2.4-into-master
Merge 4.2 into master
|
2021-10-20 17:30:57 -03:00 |
|
|
vcerenu
|
abe145c4e4
|
Update Release 4.2.4
|
2021-10-20 13:34:07 -03:00 |
|
|
Gonzalo Acuña
|
4ebeaba873
|
Merge pull request #538 from wazuh/535-release-4.2.4
Update release 4.2.4
v4.2.4
|
2021-10-20 10:09:52 -03:00 |
|
|
vcerenu
|
aa59a302c3
|
Update release 4.2.4
|
2021-10-19 16:37:13 -03:00 |
|
|
Gonzalo Acuña
|
67d92fc992
|
Merge pull request #537 from wazuh/535-release-4.2.4
Release v4.2.4
|
2021-10-18 15:28:34 -03:00 |
|
|
vcerenu
|
fbe7a0a571
|
update release 4.2.4
|
2021-10-14 16:39:41 -03:00 |
|
|
vcerenu
|
ffffe5539a
|
update release 4.2.4
|
2021-10-14 16:23:43 -03:00 |
|
|
José Fernández Aguilera
|
f17afc438e
|
Merge pull request #534 from wazuh/503-merge-master
Merge 4.2 in master
|
2021-10-13 09:34:24 +02:00 |
|
|
vcerenu
|
515f0daff4
|
Merge 4.2.3 into master
|
2021-10-12 12:34:39 -03:00 |
|
|
José Fernández Aguilera
|
d46ce7aee3
|
Merge pull request #530 from wazuh/529-release-423
Release v4.2.3
v4.2.3
|
2021-10-07 15:54:45 +02:00 |
|
|
vcerenu
|
4d0b06b91e
|
bump release 4.2.3
|
2021-10-06 08:38:25 -03:00 |
|
|
vcerenu
|
391b5d237c
|
bump release 4.2.3
|
2021-10-05 12:57:25 -03:00 |
|
|
Alberto Rodríguez
|
2a297bab38
|
Merge pull request #527 from wazuh/merge-42-into-master
Merge 4.2 in master
|
2021-10-04 15:42:01 +02:00 |
|
|
vcerenu
|
1588bc26ff
|
Merge 4.2 into master
|
2021-09-30 18:09:31 -03:00 |
|
|
vcerenu
|
c33cb0d274
|
Merge 4.2 into master
|
2021-09-30 16:54:29 -03:00 |
|
|
vcerenu
|
503db33dde
|
Merge 4.2 into master
|
2021-09-30 16:50:34 -03:00 |
|
|
vcerenu
|
61b44c37cc
|
Merge 4.2 into master
|
2021-09-30 16:33:20 -03:00 |
|
|
Alberto Rodríguez
|
f34b7d0465
|
Merge pull request #522 from wazuh/512-make-utils-persistent
Make utils.py file persistent when using volumes
|
2021-09-29 10:27:50 +02:00 |
|
|
fhielpos
|
96dfa2a8d8
|
Add utils.py to persistent_data
|
2021-09-24 11:39:56 -03:00 |
|
|
Alberto Rodríguez
|
e99ba259e0
|
Added util.py to permanent data
|
2021-09-23 20:00:03 +02:00 |
|
|
vcerenu
|
c46b8c5cd3
|
Merge pull request #519 from wazuh/Fix-log-rotation
Change tail argument to prevent log rotation issues
|
2021-09-23 13:00:48 -03:00 |
|
|
fhielpos
|
3aad1aecd5
|
Change tail argument to prevent log rotation issues
|
2021-09-23 11:40:46 -03:00 |
|
|
Alberto Rodríguez
|
f00245007d
|
Merge pull request #516 from wazuh/4.2.2
Release v4.2.2
v4.2.2
|
2021-09-15 16:50:12 +02:00 |
|
|
vcerenu
|
084407f9c9
|
Update 4.2.2
|
2021-09-15 10:55:43 -03:00 |
|
|
vcerenu
|
f0ebabad89
|
Update 4.2.2
|
2021-09-15 10:51:19 -03:00 |
|
|
Alberto Rodríguez
|
afd70ff5f9
|
Merge pull request #513 from wazuh/4.2.1
Release v4.2.1
v4.2.1
|
2021-09-14 15:12:06 +02:00 |
|
|
vcerenu
|
61f3e080a3
|
Update 4.2.1
|
2021-09-14 10:08:48 -03:00 |
|
|
vcerenu
|
2dd9fdfa99
|
Update 4.2.1
|
2021-09-14 10:03:16 -03:00 |
|
|
vcerenu
|
daaac09c9c
|
Update 4.2.1
|
2021-09-13 15:21:53 -03:00 |
|
|
vcerenu
|
8d0dd5baeb
|
Update 4.2.1
|
2021-09-09 11:13:04 -03:00 |
|
|
vcerenu
|
9e9de07322
|
Update 4.2.1
|
2021-09-09 09:23:36 -03:00 |
|
|
José Fernández Aguilera
|
6ed79996af
|
Merge pull request #509 from wazuh/fix-4.2-upgrade
Fix 4.2 upgrade
v4.2.0
|
2021-09-03 11:37:17 +02:00 |
|
|
dfolcha
|
413dd71d44
|
Remove -r flag
|
2021-09-03 09:16:20 +02:00 |
|
|
dfolcha
|
68bc08f78f
|
Add function to rename files and directories
|
2021-09-02 17:05:23 +02:00 |
|
|
dfolcha
|
6da1b19698
|
Exclude queue/ossec from volume
|
2021-09-02 15:12:33 +02:00 |
|