opennms

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

Merge remote-tracking branch 'origin/foundation-2017' into release-20.0.1

Merge pull request #1541 from OpenNMS/jira/HZN-1089

HZN-1089: Added missing include statement

Merge pull request #1537 from OpenNMS/jira/NMS-9414

NMS-9414: Revert deletion of NodeLabelChangeServlet to allow manually change of node label

Merge pull request #1535 from OpenNMS/jira/HZN-1080

HZN-1080: Convert location input field to select box

Merge branch 'NMS-9417' of https://github.com/jm-k/opennms into pr/jira/NMS-9417

NMS-9403 : Add documentation for Resource Types. (#1528)

  • NMS-9403 : Add documentation for Resource Types.

  • Fix IndexStorageStrategy class, and re-align table columns

  • Use a single line for each sentence.

HZN-1094: Upgrade to Camel 2.19.1.

Make it actually work

    • -0
    • +4
    /opennms-webapp/src/main/webapp/app/css/custom.css
    • -0
    • +1
    /opennms-webapp/src/main/webapp/index.html

Merge pull request #1545 from OpenNMS/feature-upgrade-to-spring-4.2

NMS-9409: Verify that the date from the reading is a valid timestamp in milliseconds.

Merge branch 'NMS-9409-TCP-persistence-millseconds' of https://github.com/tdefilip/opennms into pr/jira/NMS-9409

NMS-9415: Check if ipAddressIfIndex contains any data

HZN-1080: Add test to verify loading of location drop down

NMS-9415: Check if ipAddressIfIndex contains any data

If ipAddressIfIndex is null, print a warning before returning null.

(Recommit to base the pull request on release-20.0.1 instead of develop.)

Revert hardening

Merge pull request #1532 from OpenNMS/jira/HZN-1056

HZN-1056: Fixed SNI related docs for SSLCertMonitor

Merge pull request #1547 from OpenNMS/feature-upgrade-to-activemq-5.14

Revert fix for NMS-8714 since the ConnectionPool in ActiveMQ 5.14 implements the reconnectOnException option.

Revert fix for NMS-8714 since the ConnectionPool in ActiveMQ 5.14 implements the reconnectOnException option.

Revert "fix missing id property on OnmsMonitoredService in JSON"

This reverts commit c2fbbae22b1f5400cda1fd4454d55b2291f6cd21.

Revert "OnmsNode.id should be a number in JSON format"

This reverts commit d2f5b4a5369279f0e459966985374d43d3c4c495.

Revert "fix test failure from updated service model"

This reverts commit bc8238d0e4705a534b4263a88858652b44711b7e.

NMS-9415: NullPointerException during nodeScan on devices with broken IP-MIB::ipAddressIfIndex

Merge pull request #1542 from OpenNMS/jira/NMS-9424

NMS-9424: Make status indicators 100% round

retry click/wait cycle until it works

fix test failure from updated service model

OnmsNode.id should be a number in JSON format

fix missing id property on OnmsMonitoredService in JSON

use obessive selenium code instead

NMS-9460: fix JSP issues related to the JAXB changes

  • fix KSC reports (originally NMS-9447)
  • fix thresholding UI (originally NMS-9426)
  • fix non-string value passed to quartz (NMS-9454)
  1. … 14 more files in changeset.