[bamboo] Automated branch merge (from release-19.0.0:1fb7bdcafa43455e…

…f88ef269d317a7357e284744)
OpenNMS · Nov 24, 2016 · 8a56072 · 8a56072
2 parents 695a476 + 1fb7bdc
commit 8a56072
Show file tree

Hide file tree

Showing 39 changed files with 1,453 additions and 488 deletions.
diff --git a/features/bsm/daemon/src/test/java/org/opennms/netmgt/bsm/daemon/BsmdIT.java b/features/bsm/daemon/src/test/java/org/opennms/netmgt/bsm/daemon/BsmdIT.java
@@ -88,7 +88,6 @@
         "classpath*:/META-INF/opennms/component-dao.xml",
         "classpath*:/META-INF/opennms/component-service.xml",
         "classpath:/META-INF/opennms/applicationContext-daemon.xml",
-        "classpath:/META-INF/opennms/applicationContext-eventUtil.xml",
         "classpath:/META-INF/opennms/mockEventIpcManager.xml",
         "classpath:/META-INF/opennms/applicationContext-databasePopulator.xml",
         "classpath:/META-INF/opennms/applicationContext-bsmd.xml"