[OpenNMS/opennms] 215bd8: Resolve conflict
Dino via opennms-cvs <[email protected]>
| Newsgroups | gmane.network.opennms.cvs |
|---|---|
| Message-ID | <OpenNMS/opennms/push/refs/heads/dcy/no-beanshell/[email protected]> |
Branch: refs/heads/dcy/no-beanshell
Home: https://github.com/OpenNMS/opennms
Commit: 215bd8ecd5ca63c165d9bd5f5d38cf47f172cd6a
https://github.com/OpenNMS/opennms/commit/215bd8ecd5ca63c165d9bd5f5d38cf47f172cd6a
Author: Dino <[email protected]>
Date: 2026-08-05 (Wed, 05 Aug 2026)
Changed paths:
M opennms-alarms/bsf-northbounder/pom.xml
M opennms-alarms/bsf-northbounder/src/main/java/org/opennms/netmgt/alarmd/northbounder/bsf/BSFEngineHandler.java
M opennms-alarms/bsf-northbounder/src/main/resources/xsds/bsf-northbounder-configuration.xsd
M opennms-base-assembly/src/main/filtered/etc/bsf-northbounder-configuration.xml
M opennms-base-assembly/src/main/filtered/etc/examples/event-proxy/scriptd-configuration.xml
M opennms-base-assembly/src/main/filtered/etc/examples/scriptd-configuration.xml
R opennms-base-assembly/src/main/filtered/etc/examples/scriptd-event-forwarder.bsh
A opennms-base-assembly/src/main/filtered/etc/examples/scriptd-event-forwarder.groovy
M opennms-base-assembly/src/main/filtered/etc/scriptd-configuration.xml
M opennms-config-model/src/test/java/org/opennms/netmgt/config/scriptd/ScriptdConfigurationTest.java
M opennms-correlation/drools-correlation-engine/pom.xml
M opennms-correlation/drools-correlation-engine/src/test/java/org/opennms/netmgt/correlation/drools/DroolsConfigurationTest.java
M opennms-full-assembly/src/license/THIRD-PARTY.properties
M opennms-services/pom.xml
M opennms-services/src/main/java/org/opennms/netmgt/scriptd/helper/SnmpTrapHelper.java
M opennms-services/src/test/java/org/opennms/netmgt/notifd/BSFNotificationStrategyIT.java
M pom.xml
Log Message:
-----------
Resolve conflict
To unsubscribe from these emails, change your notification settings at https://github.com/OpenNMS/opennms/settings/notifications
_______________________________________________
Please read the OpenNMS Mailing List FAQ:
http://www.opennms.org/wiki/index.php?page=MailingListFaq
opennms-cvs mailing list
To *unsubscribe* or change your subscription options, see the bottom of this page:
https://lists.sourceforge.net/lists/listinfo/opennms-cvs