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

NMS-9278: More work on javadoc and making the RESTv2 services consistent.

NMS-9278: Added IpLikeCriteriaBehavior so that we can do iplike criteria against root entities of a REST service.

NMS-9278: Added distPoller alias to EventRestService.

NMS-9278: Added SQL restriction for category id and name to work around a problem with aliases in Hibernate.

Merge pull request #1558 from OpenNMS/jira/NMS-9456

NMS-9456: Fixed missing jar in shell scripts

NMS-9456: Fixed missing jar in shell scripts

[bamboo] Automated branch merge (from foundation-2016:d8a9e04273a89b24c3f1250602458b51b8dec326)

[bamboo] Automated branch merge (from foundation:9c5de2d9dd4404a8f9c58c94dc1b21c7927483a3)

Merge pull request #1521 from OpenNMS/jira/NMS-9335

NMS-9335: LoadingTopology from db result in NPE

Merge pull request #1539 from OpenNMS/jira/NMS-9421

NMS-9421: Escape favorite tooltip correctly

Fixed forgotten create time for maclink

NMS-9278: Added ability to use the CXF SearchBean instead of the entity object as the query capture bean. Added a CriteriaBehavior object that can map query terms to new names, conversions, and actions. Added a common set of aliases and behaviors that can be reused in different endpoints when you are joining the same aliases.

  1. … 11 more files in changeset.

NMS-9335: NPE in bridge topology

Fixed the NodeDiscovery to properly

save topology and forwarders

Moved Methids from SharedSegment to BridgePort

Improved the inned class follow logic

Changed the way in which the macs and ports are assigned

to segment

Added more test

Merge pull request #1552 from OpenNMS/jira/NMS-9415

NMS-9415: Check if ipAddressIfIndex contains any data

[bamboo] Automated branch merge (from foundation-2016:f374377d70f0cec7d0b1d997bf349b868630e76a)

NMS-9335: NPE in bridge topology

Added a methid to clean forwarders.

No forwardes allowed if mac is assigned on topology

Forwarders only must be defined for loose macs on domain

Merge branch 'pr/jira/NMS-9409' into foundation-2016

Fix NMS-9335: topology is not properly discovered

This add a methid to BroadCastDomain to get Forwarders

And add sme comments to NodeDiscovery

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

HZN-1080: Convert location input field to select box

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

Merge branch 'NMS-9409-TCP-persistence-millseconds' of into pr/jira/NMS-9409

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

Revert "fix missing id property on OnmsMonitoredService in JSON"

This reverts commit c2fbbae22b1f5400cda1fd4454d55b2291f6cd21.

Revert " should be a number in JSON format"

This reverts commit d2f5b4a5369279f0e459966985374d43d3c4c495.

Revert "fix test failure from updated service model"

This reverts commit bc8238d0e4705a534b4263a88858652b44711b7e.

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

NMS-9424: Make status indicators 100% round

retry click/wait cycle until it works