Skip to content

Commit

Permalink
Merge 4.5.1 into 4.6.0 (#1422)
Browse files Browse the repository at this point in the history
* Update CHANGELOG

* Merge `4.5.0` into `4.5.1` (#1421)

* Create regression_testing.md

* Update regression_testing.md

* Create regression_testing.md

* Update regression_testing.md

* Create regression_testing.md

* Update regression_testing.md

* Bump 4.5.0

* Merge 4.4.5 into 4.4 (#1419) (#1420)

* Bump Wazuh 4.4.5 (#1415)

* Update changelog

* Update package.json

* Update tag script

* Change rc_number to 0

* Change tag.py branch name

* Bump v4.4.5-8.2

* Bump RC1

---------

Co-authored-by: Nicolas Agustin Guevara Pihen <42900763+Tostti@users.noreply.github.com>
Co-authored-by: Federico Rodriguez <federico.rodriguez@wazuh.com>

---------

Co-authored-by: Nicolas Agustin Guevara Pihen <42900763+Tostti@users.noreply.github.com>
Co-authored-by: Federico Rodriguez <federico.rodriguez@wazuh.com>

---------

Co-authored-by: Maximiliano Ibarra <maximiliano.ibarra@wazuh.com>
Co-authored-by: Nicolas Agustin Guevara Pihen <42900763+Tostti@users.noreply.github.com>
Co-authored-by: Federico Rodriguez <federico.rodriguez@wazuh.com>
  • Loading branch information
4 people committed Jul 11, 2023
1 parent 55a5271 commit 5ecfc8f
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 3 deletions.
12 changes: 11 additions & 1 deletion CHANGELOG.md
Expand Up @@ -8,11 +8,21 @@ All notable changes to the Wazuh App for Splunk project will be documented in th
- Added support for Wazuh 4.6.0.
- Added Files and Registries limits sections in configurations [#1395](https://github.com/wazuh/wazuh-splunk/pull/1395)

## Wazuh v4.5.0 - Splunk Enterprise v8.1.[1-10], v8.2.x - Revision 4500
## Wazuh v4.5.1 - Splunk Enterprise v8.1.[1-10], v8.2.x - Revision 4502

### Added
- Added support for Wazuh 4.5.1.

## Wazuh v4.5.0 - Splunk Enterprise v8.1.[1-10], v8.2.x - Revision 4501

### Added
- Added support for Wazuh 4.5.0.

## Wazuh v4.4.5 - Splunk Enterprise v8.1.[1-10], v8.2.x - Revision 4405

### Added
- Added support for Wazuh 4.4.5.

## Wazuh v4.4.4 - Splunk Enterprise v8.1.[1-10], v8.2.x - Revision 4404

### Added
Expand Down
2 changes: 1 addition & 1 deletion SplunkAppForWazuh/default/app.conf
Expand Up @@ -12,7 +12,7 @@ id = SplunkAppForWazuh
check_for_updates = 1

[install]
build = 4404
build = 4405

[triggers]
reload.package = simple
Expand Down
2 changes: 1 addition & 1 deletion scripts/tag.py
Expand Up @@ -28,7 +28,7 @@
# ================================================ #
# Constants and global variables #
# ================================================ #
BRANCH = ".".join(version.split('.')[:2])
BRANCH = version
LOG_FILE = 'output.log'
TAGS_FILE = 'tags.log'

Expand Down

0 comments on commit 5ecfc8f

Please sign in to comment.