Build #190

Build: #190 failed Changes by Benjamin Reed

Build result summary

Details

Completed
Labels
None
Revisions
OpenNMS (develop branch)
421435e64062076a1eefc1adde96a6d331dbcbda 421435e64062076a1eefc1adde96a6d331dbcbda
OpenNMS Installer
da12784d9ab4ba4aacedec0283d0c04075fd6ebf da12784d9ab4ba4aacedec0283d0c04075fd6ebf
OpenNMS-Repo
4e156ac6b8804bf3905913b3e27d832c6f53902e 4e156ac6b8804bf3905913b3e27d832c6f53902e
Smoke Tests
cb1e72265cf2ce10cb4872f58120272b340a1ce1 cb1e72265cf2ce10cb4872f58120272b340a1ce1
OpenNMS Bamboo Utils
0cc2b016b53a4c518d5d3276b6087e05db232bde 0cc2b016b53a4c518d5d3276b6087e05db232bde
OpenNMS System Test API
2f3a985377db43ce9b451390b9744bac402ffbd7 2f3a985377db43ce9b451390b9744bac402ffbd7
Failing since
#189 (Changes by Benjamin Reed)

Responsible

Branch integration details

Checked out
foundation-2017 711921db3fb2769c30b478569ec9658230a7916f
Merged with
foundation-2016 421435e64062076a1eefc1adde96a6d331dbcbda 421435e64062076a1eefc1adde96a6d331dbcbda
Failure reason
Merge command error: Auto-merging protocols/xml/pom.xml CONFLICT (content): Merge conflict in protocols/xml/pom.xml Auto-merging pom.xml CONFLICT (content): Merge conflict in pom.xml Auto-merging opennms-webapp/pom.xml CONFLICT (content): Merge conflict in opennms-webapp/pom.xml Auto-merging opennms-webapp-rest/pom.xml CONFLICT (content): Merge conflict in opennms-webapp-rest/pom.xml Auto-merging opennms-services/pom.xml CONFLICT (content): Merge conflict in opennms-services/pom.xml Auto-merging opennms-rrd/pom.xml Auto-merging opennms-rrd/opennms-rrd-tcp/pom.xml Auto-merging opennms-dao/pom.xml CONFLICT (content): Merge conflict in opennms-dao/pom.xml Auto-merging opennms-config/pom.xml CONFLICT (content): Merge conflict in opennms-config/pom.xml Auto-merging integration-tests/remote-poller-18/pom.xml CONFLICT (modify/delete): features/topology-map/plugins/org.opennms.features.topology.plugins.topo.simple/pom.xml deleted in HEAD and modified in 421435e64062076a1eefc1adde96a6d331dbcbda. Version 421435e64062076a1eefc1adde96a6d331dbcbda of features/topology-map/plugins/org.opennms.features.topology.plugins.topo.simple/pom.xml left in tree. Auto-merging features/topology-map/org.opennms.features.topology.app/pom.xml Auto-merging features/opennms-es-rest/main-module/pom.xml Auto-merging features/ncs/ncs-drools/pom.xml CONFLICT (content): Merge conflict in features/ncs/ncs-drools/pom.xml Auto-merging features/amqp/event-receiver/pom.xml Auto-merging features/amqp/event-forwarder/pom.xml Auto-merging features/amqp/common/pom.xml Auto-merging features/amqp/alarm-northbounder/pom.xml Auto-merging features/alarm-change-notifier/pg-jdbc-utils/pom.xml Auto-merging features/alarm-change-notifier/main-module/pom.xml Automatic merge failed; fix conflicts and then commit the result.

Code commits

OpenNMS (develop branch)
Author Commit Message Commit date
Benjamin Reed Benjamin Reed 421435e64062076a1eefc1adde96a6d331dbcbda 421435e64062076a1eefc1adde96a6d331dbcbda Merge remote-tracking branch 'origin/jira/NMS-10689-f2016' into foundation-2016
Benjamin Reed Benjamin Reed 9a7d00bd0bdb3bd2493f99c04bebab0f9b904a12 m 9a7d00bd0bdb3bd2493f99c04bebab0f9b904a12 Merge branch 'jira/NMS-10689' into jira/NMS-10689-f2016
Benjamin Reed Benjamin Reed 68d4897003499170cd2c9fb6787e4bd53ec2f5f1 m 68d4897003499170cd2c9fb6787e4bd53ec2f5f1 NMS-10689: add options to skip surefire tests

Jira issues

IssueDescriptionStatus
Unknown Issue TypeNMS-10689Could not obtain issue details from Jira