opennms

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates

NMS-9335: LoadingTopology from db result in NPE

Added a property to bradcast domain

to hold forwading element that cannot be

assigned to the shared segment.

Better log and review test

Merge remote-tracking branch 'origin/foundation-2017' into develop

Merge remote-tracking branch 'origin/foundation-2016' into foundation-2017

    • -1
    • +1
    /opennms-webapp/src/main/webapp/element/node.jsp

NMS-9278: Make InetAddress fields mappable and allow searching alarms by service.name and ipAddr string

NMS-9278: Make InetAddress fields mappable and allow searching alarms by service.name and ipAddr string

NMS-9278: Make InetAddress fields mappable and allow searching alarms by service.name and ipAddr string

NMS-9278: Make InetAddress fields mappable and allow searching alarms by service.name and ipAddr string

Merge branch 'jira/NMS-9407' into foundation-2017

[bamboo] Automated branch merge (from foundation:073db6f9343b3d05d17308c4d66f335c581100cd)

    • -1
    • +1
    /opennms-webapp/src/main/webapp/element/node.jsp
    • -4
    • +4
    /opennms-webapp/src/main/webapp/graph/index.jsp

Merge branch 'jira/NMS-9361-devel' into develop

HZN-1082: Conditionally expose required modules, packages and types when using Java 9.

Also switch from using the maven-jaxb2-plugin to the cxf-xjc-plugin in order to generate

JAXB annotated classes from XSDs since the later works under Java 9.

    • -17
    • +36
    /features/jmx-config-generator/pom.xml

Merge pull request #1525 from OpenNMS/jira/HZN-1050

HZN-1050: Add support for Jetty request logging (NSCA format)

Merge remote-tracking branch 'origin/foundation-2016' into foundation-2017

Merge pull request #1524 from OpenNMS/jira/HZN-1081

HZN-1081: Avoid depending on tools.jar in Java 9+

Merge pull request #1527 from OpenNMS/features/xss-fixes-f16

NMS-9353: Escape the node label in the Growl message

Merge pull request #1526 from OpenNMS/features/xss-fixes

NMS-9353: NMS-9354: NMS-9355: Escape additional fields to help prevent XSS

NMS-9407: Preserve the ordering of the latency metrics when marshaling these to and from XML.

NMS-9407: Move CollectionMath from opennms-util to core/lib.

This fixes a ClassNotFoundException in the StrafePing monitor when

running on Minion since opennms-util doesn't expose the relevant package,

but core/lib does.

NMS-9407: Include the error message / reason on failure.

NMS-9407: Fix number formatting error when trying to format a Long using %f

Merge remote-tracking branch 'origin/master' into develop

NMS-9361: Key the thresholder's state using only the label, since the instance ids in the WS-Man collector are now unique.

Merge pull request #1529 from OpenNMS/jira/HZN-1055

HZN-1055: Adopt changes from HZN-950.

HZN-1055: Addopt changes from HZN-950.

Merge remote-tracking branch 'origin/foundation-2017' into jw/merge-f17-devel

NMS-9265: Fix failing smoke test in develop

Squashed commit of the following:

commit 89994218bad8ff503147fe9c390d0c66c6db98fd

Author: Jesse White <jesse@opennms.org>

Date: Mon Jun 5 12:23:55 2017 -0400

Add retries and disable automatic refresh in test setup.

commit f031b983adfd9ebbb76ba55476ecef2bacd4c79d

Author: Jesse White <jesse@opennms.org>

Date: Fri Jun 2 09:57:41 2017 -0400

Rework the test ordering.

commit e7fdee6d2904094b6bf168e2d49d257a5e85dc37

Merge: 9dac604 7047ed6

Author: Jesse White <jesse@opennms.org>

Date: Fri Jun 2 09:14:00 2017 -0400

Merge remote-tracking branch 'origin/develop' into jira/NMS-9265-develop

commit 9dac60485e7626e2de4a195eb1dfdc17b296ec6a

Author: Markus von Rüden <mvr@opennms.com>

Date: Thu Jun 1 12:32:17 2017 +0200

Fix failing smoke test

commit 1b5b9617dea814c4ef39a88271c2c58408e842e0

Author: Markus von Rüden <mvr@opennms.com>

Date: Thu Jun 1 12:31:33 2017 +0200

Merge origin/foundation-2017 into develop

NMS-9335: LoadingTopology from db result in NPE

Fixed an error while calculating bridge

bft on briadcast domain.

Added a test to check

Merge remote-tracking branch 'origin/foundation-2016' into foundation-2017

Merge pull request #1523 from OpenNMS/jira/NMS-9361

NMS-9361: Fix thresholding for generic type resources built using the CollectionSetBuilder.

Merge pull request #1520 from OpenNMS/jira/NMS-9356

NMS-9356: Allow provisiond to perform reverse lookups without requiring an A record