opennms

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

Merge pull request #1494 from OpenNMS/jira/NMS-9127-docs-only

NMS-9127: document disabling package upgrade while running

NMS-9363: Upgrade to osgi-pluginmanager that is compatible with Pax Web 4 and Pax Web 6.

fix missing merged file

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

    • -0
    • +1
    /features/topology-map/features/pom.xml
    • -0
    • +1
    /features/topology-map/plugins/pom.xml

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

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

NMS-9319: Fixed Netty4 ByteBuf handling. Added tests to verify that the Netty4 ResourceLeakDetector is not detecting any reference count leaks.

Merge pull request #1499 from OpenNMS/jira/NMS-9362

NMS-9362: Tweak Mattermost notification docs not to specify a channel

NMS-9362: Tweak Mattermost notification docs not to specify a channel

Reworked Mattermost and Slack sections. More basic starter example with full

enumeration of all currently supported options. Linked to incoming webhook docs

for both platforms.

NMS-9128: Asset to topology mapper plugin. Take 2 (#1475)

    • -0
    • +1
    /features/topology-map/features/pom.xml
  1. … 78 more files in changeset.

Hide header and footer if quiet is not set.

    • -0
    • +1
    /opennms-webapp/src/main/webapp/login.jsp
    • -0
    • +1
    /opennms-webapp/src/main/webapp/logoff.jsp

Initial application layout and prototype legacy access

    • -0
    • +60
    /opennms-webapp/src/main/webapp/app/app.module.js
    • -0
    • +0
    /opennms-webapp/src/main/webapp/app/app.routes.js
    • -0
    • +96
    /opennms-webapp/src/main/webapp/home.jsp
    • -0
    • +44
    /opennms-webapp/src/main/webapp/index.html
    • -96
    • +0
    /opennms-webapp/src/main/webapp/index.jsp

NMS-9261: Disable the NaN on counter wrap during the NewtsConverterIT (since it is now enabled by default)

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

Merge pull request #1495 from OpenNMS/jira/NMS-9261-2

NMS-9261: Make org.opennms.newts.nan_on_counter_wrap=true by default.

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

HZN-1086, HZN-1087: Upgrade to Camel 2.18.4 and ActiveMQ 5.14.5. Upgrade CXF to 3.1.11 to match the version used by Camel.

    • -1
    • +5
    /features/minion/container/karaf/pom.xml

HZN-1086, HZN-1087: Upgrade to Camel 2.18.4 and ActiveMQ 5.14.5. Upgrade CXF to 3.1.11 to match the version used by Camel.

    • -1
    • +4
    /features/minion/container/karaf/pom.xml

Merge pull request #1491 from OpenNMS/feature-upgrade-to-activemq-5.13.3

    • -0
    • +18
    /features/amqp/alarm-northbounder/pom.xml
    • -0
    • +18
    /features/amqp/event-forwarder/pom.xml
    • -0
    • +18
    /features/amqp/event-receiver/pom.xml
  1. … 3 more files in changeset.

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

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

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

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

NMS-9203: Moved deadLetterStrategy inside the existing wildcard policyEntry block so that it works properly. Added test for DLQ behavior.

  1. … 5 more files in changeset.

Remove unused SpringSource maven repos.

Merge pull request #1480 from OpenNMS/jira/NMS-9325

NMS-9325: Calculation of KSC reports timespans "Last Week" and "This Week" broken

Merge pull request #1477 from OpenNMS/jira/NMS-7904

NMS-7904: Allow root arrays in json datacollection

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

HZN-1055: Added scvcli utility for setting, listing and retrieving cr…

Get rid of separate minionKarafVersion in favor of karafVersion.

    • -4
    • +4
    /features/minion/container/karaf/pom.xml
    • -3
    • +3
    /features/minion/core/repository/pom.xml
    • -1
    • +1
    /features/minion/shell/collection/pom.xml
    • -1
    • +1
    /features/minion/shell/provision/pom.xml

Created a paxWebVersion build property.