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

[bamboo] Automated branch merge (from foundation-2017:b2e2e8c412e56d8bdc782fd07d4a4f5d0754f7f9)

Merge pull request #1560 from OpenNMS/jira/NMS-9455

NMS-9455: BridgeTopology Discovery Mismatch after opennms restart

Removed forgotten debug print out

NMS-9455: BridgeTopology Discovery Mismatch after opennms restart

The forwarders mac address are persisted into bridgemaclink table

The topology is loaded at startup properly adding shared segments and forwarders too.

The loadTopology test has been improved for new initialization

A new BroadcastDomainTest has been created

[bamboo] Automated branch merge (from foundation-2017:e834d05b6a0bbc72eb7390ab109de06573f3803e)

[bamboo] Automated branch merge (from foundation-2017:ed45ff55df27d36133ce57e9afddd39cfe605390)

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-2017:95520af48a1c1c01906b42e654c5dd90809fcc1b)

[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

[bamboo] Automated branch merge (from foundation-2017:ff6d096498f92b3e3a583fa0b794924c4c366ef1)

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

NMS-9421: Escape favorite tooltip correctly

Fixed forgotten create time for maclink

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

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

NMS-9419: Ignore failing test.

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

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