Christian Pape
2017-07-23 07:14:25 UTC
Branch: refs/heads/jira/HZN-1112
Home: https://github.com/OpenNMS/opennms
Commit: de386b427543918ee52b4fa3e4bd3b603f698736
https://github.com/OpenNMS/opennms/commit/de386b427543918ee52b4fa3e4bd3b603f698736
Author: Seth Leger <***@opennms.org>
Date: 2017-07-10 (Mon, 10 Jul 2017)
Changed paths:
M opennms-doc/guide-development/src/asciidoc/text/rest/alarms.adoc
M opennms-doc/guide-development/src/asciidoc/text/rest/rest-api.adoc
Log Message:
-----------
NMS-9478: Remove docs for query parameter
Commit: f1811b2c42dde572787ebb7c4a57b8b5ad8fd9a6
https://github.com/OpenNMS/opennms/commit/f1811b2c42dde572787ebb7c4a57b8b5ad8fd9a6
Author: Seth Leger <***@opennms.org>
Date: 2017-07-12 (Wed, 12 Jul 2017)
Changed paths:
M opennms-webapp/src/main/webapp/WEB-INF/web.xml
Log Message:
-----------
NMS-9133: Added RESTv2 API URL to CORS filter configuration
Commit: 64acd5ccd44ccc1b6420cb7a87a2febec020865a
https://github.com/OpenNMS/opennms/commit/64acd5ccd44ccc1b6420cb7a87a2febec020865a
Author: Seth Leger <***@opennms.org>
Date: 2017-07-12 (Wed, 12 Jul 2017)
Changed paths:
M features/vaadin-surveillance-views/src/main/java/org/opennms/features/vaadin/surveillanceviews/service/DefaultSurveillanceViewService.java
Log Message:
-----------
NMS-9476: Use parameterized SQL inside DefaultSurveillanceViewService
Commit: ca94f3719b9539e4a2db30b9fb498076312e4d20
https://github.com/OpenNMS/opennms/commit/ca94f3719b9539e4a2db30b9fb498076312e4d20
Author: Seth Leger <***@opennms.org>
Date: 2017-07-14 (Fri, 14 Jul 2017)
Changed paths:
M opennms-webapp/src/main/webapp/WEB-INF/web.xml
Log Message:
-----------
Merge pull request #1592 from OpenNMS/jira/NMS-9133
Commit: 0b95e7660340eda578a8fd68ee4bfaa4a8271976
https://github.com/OpenNMS/opennms/commit/0b95e7660340eda578a8fd68ee4bfaa4a8271976
Author: Seth Leger <***@opennms.org>
Date: 2017-07-14 (Fri, 14 Jul 2017)
Changed paths:
M opennms-webapp/src/main/java/org/opennms/web/rest/OnmsRestService.java
M opennms-webapp/src/test/java/org/opennms/web/rest/AlarmRestServiceTest.java
Log Message:
-----------
NMS-9478: Remove query parameter from OnmsRestService
Commit: 17599d7066efa97482c70aaef712e5780d68d916
https://github.com/OpenNMS/opennms/commit/17599d7066efa97482c70aaef712e5780d68d916
Author: Seth Leger <***@opennms.org>
Date: 2017-07-14 (Fri, 14 Jul 2017)
Changed paths:
M opennms-doc/guide-development/src/asciidoc/text/rest/alarms.adoc
M opennms-doc/guide-development/src/asciidoc/text/rest/rest-api.adoc
Log Message:
-----------
Merge pull request #1591 from OpenNMS/jira/NMS-9478-docs
Commit: 278ab00d0296ee37cfa6812931c1314935c0033c
https://github.com/OpenNMS/opennms/commit/278ab00d0296ee37cfa6812931c1314935c0033c
Author: Atlassian Bamboo <***@opennms.org>
Date: 2017-07-14 (Fri, 14 Jul 2017)
Changed paths:
M opennms-webapp/src/main/webapp/WEB-INF/web.xml
Log Message:
-----------
[bamboo] Automated branch merge (from foundation-2017:ca94f3719b9539e4a2db30b9fb498076312e4d20)
Commit: 7a624155938a6decca123c8e1bc11ff85f42f27d
https://github.com/OpenNMS/opennms/commit/7a624155938a6decca123c8e1bc11ff85f42f27d
Author: Seth Leger <***@opennms.org>
Date: 2017-07-14 (Fri, 14 Jul 2017)
Changed paths:
M container/features/pom.xml
M container/features/src/main/resources/features.xml
Log Message:
-----------
NMS-9341: Fixed ClassNotFoundException for OSGi DataSourceFactory
Commit: 13ecaa7be98cbc3f2de7087df3a4c4a5bb93e49e
https://github.com/OpenNMS/opennms/commit/13ecaa7be98cbc3f2de7087df3a4c4a5bb93e49e
Author: Atlassian Bamboo <***@opennms.org>
Date: 2017-07-15 (Sat, 15 Jul 2017)
Changed paths:
M opennms-doc/guide-development/src/asciidoc/text/rest/alarms.adoc
M opennms-doc/guide-development/src/asciidoc/text/rest/rest-api.adoc
Log Message:
-----------
[bamboo] Automated branch merge (from foundation-2016:17599d7066efa97482c70aaef712e5780d68d916)
Commit: c8958b1e663f6d88ab05a24fdf59bdf5dc8bcf44
https://github.com/OpenNMS/opennms/commit/c8958b1e663f6d88ab05a24fdf59bdf5dc8bcf44
Author: Atlassian Bamboo <***@opennms.org>
Date: 2017-07-15 (Sat, 15 Jul 2017)
Changed paths:
M opennms-doc/guide-development/src/asciidoc/text/rest/alarms.adoc
M opennms-doc/guide-development/src/asciidoc/text/rest/rest-api.adoc
Log Message:
-----------
[bamboo] Automated branch merge (from foundation-2017:13ecaa7be98cbc3f2de7087df3a4c4a5bb93e49e)
Commit: 855b1117897f0f271de4ce1243c33695772832ce
https://github.com/OpenNMS/opennms/commit/855b1117897f0f271de4ce1243c33695772832ce
Author: Seth Leger <***@opennms.org>
Date: 2017-07-17 (Mon, 17 Jul 2017)
Changed paths:
M features/vaadin-surveillance-views/src/main/java/org/opennms/features/vaadin/surveillanceviews/service/DefaultSurveillanceViewService.java
Log Message:
-----------
Merge pull request #1593 from OpenNMS/jira/NMS-9476
Commit: c62e59c1bc31a8af782f6dfd453ee8027e220f5a
https://github.com/OpenNMS/opennms/commit/c62e59c1bc31a8af782f6dfd453ee8027e220f5a
Author: Seth Leger <***@opennms.org>
Date: 2017-07-17 (Mon, 17 Jul 2017)
Changed paths:
M container/features/pom.xml
M container/features/src/main/resources/features.xml
Log Message:
-----------
Merge pull request #1596 from OpenNMS/jira/NMS-9341
Commit: 22ff12d0952cadcbf1ee6fb84f8c0fda1d1935d0
https://github.com/OpenNMS/opennms/commit/22ff12d0952cadcbf1ee6fb84f8c0fda1d1935d0
Author: Atlassian Bamboo <***@opennms.org>
Date: 2017-07-17 (Mon, 17 Jul 2017)
Changed paths:
M features/vaadin-surveillance-views/src/main/java/org/opennms/features/vaadin/surveillanceviews/service/DefaultSurveillanceViewService.java
Log Message:
-----------
[bamboo] Automated branch merge (from foundation-2016:855b1117897f0f271de4ce1243c33695772832ce)
Commit: 7170327dc5f7daa1fd4be5b25bfb43b271ca14cd
https://github.com/OpenNMS/opennms/commit/7170327dc5f7daa1fd4be5b25bfb43b271ca14cd
Author: Jesse White <***@gmail.com>
Date: 2017-07-17 (Mon, 17 Jul 2017)
Changed paths:
M opennms-webapp/src/main/java/org/opennms/web/rest/OnmsRestService.java
M opennms-webapp/src/test/java/org/opennms/web/rest/AlarmRestServiceTest.java
Log Message:
-----------
Merge pull request #1590 from OpenNMS/jira/NMS-9478
NMS-9478: Remove query parameter from OnmsRestService
Commit: 27fa7ea6f46361b4820215c8c055fc7a0b2d8c68
https://github.com/OpenNMS/opennms/commit/27fa7ea6f46361b4820215c8c055fc7a0b2d8c68
Author: Atlassian Bamboo <***@opennms.org>
Date: 2017-07-17 (Mon, 17 Jul 2017)
Changed paths:
M features/vaadin-surveillance-views/src/main/java/org/opennms/features/vaadin/surveillanceviews/service/DefaultSurveillanceViewService.java
Log Message:
-----------
[bamboo] Automated branch merge (from foundation-2017:22ff12d0952cadcbf1ee6fb84f8c0fda1d1935d0)
Commit: bcd9468a08d99bdff8a4d6a962b606e5cde296ec
https://github.com/OpenNMS/opennms/commit/bcd9468a08d99bdff8a4d6a962b606e5cde296ec
Author: Benjamin Reed <***@opennms.org>
Date: 2017-07-18 (Tue, 18 Jul 2017)
Changed paths:
M opennms-webapp-rest/src/main/java/org/opennms/web/rest/v1/OnmsRestService.java
M opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/AlarmRestServiceIT.java
Log Message:
-----------
Merge remote-tracking branch 'origin/foundation' into foundation-2016
Commit: 119a11455d7049fe9032bab19ccde3cc97e91981
https://github.com/OpenNMS/opennms/commit/119a11455d7049fe9032bab19ccde3cc97e91981
Author: DJ Gregor <***@gregor.com>
Date: 2017-07-18 (Tue, 18 Jul 2017)
Changed paths:
A core/daemon/src/test/java/org/opennms/netmgt/daemon/ConditionalActiveMQContextIT.java
R core/daemon/src/test/java/org/opennms/netmgt/daemon/ConditionalActiveMQContextTest.java
A features/poller/monitors/core/src/test/java/org/opennms/netmgt/poller/monitors/DNSResolutionMonitorIT.java
R features/poller/monitors/core/src/test/java/org/opennms/netmgt/poller/monitors/DNSResolutionMonitorTest.java
M features/topology-map/plugins/org.opennms.features.topology.plugins.topo.asset/src/test/java/org/opennms/features/topology/plugins/topo/asset/AssetGraphDefinitionRepositoryTest.java
A opennms-icmp/opennms-icmp-jna/src/test/java/org/opennms/netmgt/icmp/jna/JnaPingIT.java
R opennms-icmp/opennms-icmp-jna/src/test/java/org/opennms/netmgt/icmp/jna/JnaPingTest.java
A opennms-icmp/opennms-icmp-jni/src/test/java/org/opennms/netmgt/icmp/jni/JniPingIT.java
R opennms-icmp/opennms-icmp-jni/src/test/java/org/opennms/netmgt/icmp/jni/JniPingTest.java
A opennms-icmp/opennms-icmp-jni6/src/test/java/org/opennms/netmgt/icmp/jni6/Jni6PingIT.java
R opennms-icmp/opennms-icmp-jni6/src/test/java/org/opennms/netmgt/icmp/jni6/Jni6PingTest.java
Log Message:
-----------
NMS-9514: Rename integration tests that are currently running as unit tests (#1598)
* Rename integration tests that are currently running as unit tests
* Rename integration tests that are currently running as unit tests
* Fix intermittent error if features/topology-map/plugins/org.opennms.features.topology.plugins.topo.asset/target/etc/org.opennms.features.topology.plugins.topo.asset.xml exists
Commit: 0c56b67d6ab312064aff17be5afee974ee2d682a
https://github.com/OpenNMS/opennms/commit/0c56b67d6ab312064aff17be5afee974ee2d682a
Author: Atlassian Bamboo <***@opennms.org>
Date: 2017-07-18 (Tue, 18 Jul 2017)
Changed paths:
M opennms-webapp-rest/src/main/java/org/opennms/web/rest/v1/OnmsRestService.java
M opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/AlarmRestServiceIT.java
Log Message:
-----------
[bamboo] Automated branch merge (from foundation-2016:bcd9468a08d99bdff8a4d6a962b606e5cde296ec)
Commit: 84f3605590f862d4d190fb6aac9e6842ec28ad3c
https://github.com/OpenNMS/opennms/commit/84f3605590f862d4d190fb6aac9e6842ec28ad3c
Author: Atlassian Bamboo <***@opennms.org>
Date: 2017-07-19 (Wed, 19 Jul 2017)
Changed paths:
M opennms-webapp-rest/src/main/java/org/opennms/web/rest/v1/OnmsRestService.java
M opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/AlarmRestServiceIT.java
Log Message:
-----------
[bamboo] Automated branch merge (from foundation-2017:0c56b67d6ab312064aff17be5afee974ee2d682a)
Commit: 422eeb4693e8b4593a3b4b00ec34fbe254bac217
https://github.com/OpenNMS/opennms/commit/422eeb4693e8b4593a3b4b00ec34fbe254bac217
Author: Christian Pape <***@informatik.hs-fulda.de>
Date: 2017-07-23 (Sun, 23 Jul 2017)
Changed paths:
M container/features/pom.xml
M container/features/src/main/resources/features.xml
A core/daemon/src/test/java/org/opennms/netmgt/daemon/ConditionalActiveMQContextIT.java
R core/daemon/src/test/java/org/opennms/netmgt/daemon/ConditionalActiveMQContextTest.java
A features/poller/monitors/core/src/test/java/org/opennms/netmgt/poller/monitors/DNSResolutionMonitorIT.java
R features/poller/monitors/core/src/test/java/org/opennms/netmgt/poller/monitors/DNSResolutionMonitorTest.java
M features/topology-map/plugins/org.opennms.features.topology.plugins.topo.asset/src/test/java/org/opennms/features/topology/plugins/topo/asset/AssetGraphDefinitionRepositoryTest.java
M features/vaadin-surveillance-views/src/main/java/org/opennms/features/vaadin/surveillanceviews/service/DefaultSurveillanceViewService.java
M opennms-doc/guide-development/src/asciidoc/text/rest/alarms.adoc
M opennms-doc/guide-development/src/asciidoc/text/rest/rest-api.adoc
A opennms-icmp/opennms-icmp-jna/src/test/java/org/opennms/netmgt/icmp/jna/JnaPingIT.java
R opennms-icmp/opennms-icmp-jna/src/test/java/org/opennms/netmgt/icmp/jna/JnaPingTest.java
A opennms-icmp/opennms-icmp-jni/src/test/java/org/opennms/netmgt/icmp/jni/JniPingIT.java
R opennms-icmp/opennms-icmp-jni/src/test/java/org/opennms/netmgt/icmp/jni/JniPingTest.java
A opennms-icmp/opennms-icmp-jni6/src/test/java/org/opennms/netmgt/icmp/jni6/Jni6PingIT.java
R opennms-icmp/opennms-icmp-jni6/src/test/java/org/opennms/netmgt/icmp/jni6/Jni6PingTest.java
M opennms-webapp-rest/src/main/java/org/opennms/web/rest/v1/OnmsRestService.java
M opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/AlarmRestServiceIT.java
M opennms-webapp/src/main/webapp/WEB-INF/web.xml
Log Message:
-----------
Merge branch 'develop' into jira/HZN-1112
Compare: https://github.com/OpenNMS/opennms/compare/c00a0eb80475...422eeb4693e8
Home: https://github.com/OpenNMS/opennms
Commit: de386b427543918ee52b4fa3e4bd3b603f698736
https://github.com/OpenNMS/opennms/commit/de386b427543918ee52b4fa3e4bd3b603f698736
Author: Seth Leger <***@opennms.org>
Date: 2017-07-10 (Mon, 10 Jul 2017)
Changed paths:
M opennms-doc/guide-development/src/asciidoc/text/rest/alarms.adoc
M opennms-doc/guide-development/src/asciidoc/text/rest/rest-api.adoc
Log Message:
-----------
NMS-9478: Remove docs for query parameter
Commit: f1811b2c42dde572787ebb7c4a57b8b5ad8fd9a6
https://github.com/OpenNMS/opennms/commit/f1811b2c42dde572787ebb7c4a57b8b5ad8fd9a6
Author: Seth Leger <***@opennms.org>
Date: 2017-07-12 (Wed, 12 Jul 2017)
Changed paths:
M opennms-webapp/src/main/webapp/WEB-INF/web.xml
Log Message:
-----------
NMS-9133: Added RESTv2 API URL to CORS filter configuration
Commit: 64acd5ccd44ccc1b6420cb7a87a2febec020865a
https://github.com/OpenNMS/opennms/commit/64acd5ccd44ccc1b6420cb7a87a2febec020865a
Author: Seth Leger <***@opennms.org>
Date: 2017-07-12 (Wed, 12 Jul 2017)
Changed paths:
M features/vaadin-surveillance-views/src/main/java/org/opennms/features/vaadin/surveillanceviews/service/DefaultSurveillanceViewService.java
Log Message:
-----------
NMS-9476: Use parameterized SQL inside DefaultSurveillanceViewService
Commit: ca94f3719b9539e4a2db30b9fb498076312e4d20
https://github.com/OpenNMS/opennms/commit/ca94f3719b9539e4a2db30b9fb498076312e4d20
Author: Seth Leger <***@opennms.org>
Date: 2017-07-14 (Fri, 14 Jul 2017)
Changed paths:
M opennms-webapp/src/main/webapp/WEB-INF/web.xml
Log Message:
-----------
Merge pull request #1592 from OpenNMS/jira/NMS-9133
Commit: 0b95e7660340eda578a8fd68ee4bfaa4a8271976
https://github.com/OpenNMS/opennms/commit/0b95e7660340eda578a8fd68ee4bfaa4a8271976
Author: Seth Leger <***@opennms.org>
Date: 2017-07-14 (Fri, 14 Jul 2017)
Changed paths:
M opennms-webapp/src/main/java/org/opennms/web/rest/OnmsRestService.java
M opennms-webapp/src/test/java/org/opennms/web/rest/AlarmRestServiceTest.java
Log Message:
-----------
NMS-9478: Remove query parameter from OnmsRestService
Commit: 17599d7066efa97482c70aaef712e5780d68d916
https://github.com/OpenNMS/opennms/commit/17599d7066efa97482c70aaef712e5780d68d916
Author: Seth Leger <***@opennms.org>
Date: 2017-07-14 (Fri, 14 Jul 2017)
Changed paths:
M opennms-doc/guide-development/src/asciidoc/text/rest/alarms.adoc
M opennms-doc/guide-development/src/asciidoc/text/rest/rest-api.adoc
Log Message:
-----------
Merge pull request #1591 from OpenNMS/jira/NMS-9478-docs
Commit: 278ab00d0296ee37cfa6812931c1314935c0033c
https://github.com/OpenNMS/opennms/commit/278ab00d0296ee37cfa6812931c1314935c0033c
Author: Atlassian Bamboo <***@opennms.org>
Date: 2017-07-14 (Fri, 14 Jul 2017)
Changed paths:
M opennms-webapp/src/main/webapp/WEB-INF/web.xml
Log Message:
-----------
[bamboo] Automated branch merge (from foundation-2017:ca94f3719b9539e4a2db30b9fb498076312e4d20)
Commit: 7a624155938a6decca123c8e1bc11ff85f42f27d
https://github.com/OpenNMS/opennms/commit/7a624155938a6decca123c8e1bc11ff85f42f27d
Author: Seth Leger <***@opennms.org>
Date: 2017-07-14 (Fri, 14 Jul 2017)
Changed paths:
M container/features/pom.xml
M container/features/src/main/resources/features.xml
Log Message:
-----------
NMS-9341: Fixed ClassNotFoundException for OSGi DataSourceFactory
Commit: 13ecaa7be98cbc3f2de7087df3a4c4a5bb93e49e
https://github.com/OpenNMS/opennms/commit/13ecaa7be98cbc3f2de7087df3a4c4a5bb93e49e
Author: Atlassian Bamboo <***@opennms.org>
Date: 2017-07-15 (Sat, 15 Jul 2017)
Changed paths:
M opennms-doc/guide-development/src/asciidoc/text/rest/alarms.adoc
M opennms-doc/guide-development/src/asciidoc/text/rest/rest-api.adoc
Log Message:
-----------
[bamboo] Automated branch merge (from foundation-2016:17599d7066efa97482c70aaef712e5780d68d916)
Commit: c8958b1e663f6d88ab05a24fdf59bdf5dc8bcf44
https://github.com/OpenNMS/opennms/commit/c8958b1e663f6d88ab05a24fdf59bdf5dc8bcf44
Author: Atlassian Bamboo <***@opennms.org>
Date: 2017-07-15 (Sat, 15 Jul 2017)
Changed paths:
M opennms-doc/guide-development/src/asciidoc/text/rest/alarms.adoc
M opennms-doc/guide-development/src/asciidoc/text/rest/rest-api.adoc
Log Message:
-----------
[bamboo] Automated branch merge (from foundation-2017:13ecaa7be98cbc3f2de7087df3a4c4a5bb93e49e)
Commit: 855b1117897f0f271de4ce1243c33695772832ce
https://github.com/OpenNMS/opennms/commit/855b1117897f0f271de4ce1243c33695772832ce
Author: Seth Leger <***@opennms.org>
Date: 2017-07-17 (Mon, 17 Jul 2017)
Changed paths:
M features/vaadin-surveillance-views/src/main/java/org/opennms/features/vaadin/surveillanceviews/service/DefaultSurveillanceViewService.java
Log Message:
-----------
Merge pull request #1593 from OpenNMS/jira/NMS-9476
Commit: c62e59c1bc31a8af782f6dfd453ee8027e220f5a
https://github.com/OpenNMS/opennms/commit/c62e59c1bc31a8af782f6dfd453ee8027e220f5a
Author: Seth Leger <***@opennms.org>
Date: 2017-07-17 (Mon, 17 Jul 2017)
Changed paths:
M container/features/pom.xml
M container/features/src/main/resources/features.xml
Log Message:
-----------
Merge pull request #1596 from OpenNMS/jira/NMS-9341
Commit: 22ff12d0952cadcbf1ee6fb84f8c0fda1d1935d0
https://github.com/OpenNMS/opennms/commit/22ff12d0952cadcbf1ee6fb84f8c0fda1d1935d0
Author: Atlassian Bamboo <***@opennms.org>
Date: 2017-07-17 (Mon, 17 Jul 2017)
Changed paths:
M features/vaadin-surveillance-views/src/main/java/org/opennms/features/vaadin/surveillanceviews/service/DefaultSurveillanceViewService.java
Log Message:
-----------
[bamboo] Automated branch merge (from foundation-2016:855b1117897f0f271de4ce1243c33695772832ce)
Commit: 7170327dc5f7daa1fd4be5b25bfb43b271ca14cd
https://github.com/OpenNMS/opennms/commit/7170327dc5f7daa1fd4be5b25bfb43b271ca14cd
Author: Jesse White <***@gmail.com>
Date: 2017-07-17 (Mon, 17 Jul 2017)
Changed paths:
M opennms-webapp/src/main/java/org/opennms/web/rest/OnmsRestService.java
M opennms-webapp/src/test/java/org/opennms/web/rest/AlarmRestServiceTest.java
Log Message:
-----------
Merge pull request #1590 from OpenNMS/jira/NMS-9478
NMS-9478: Remove query parameter from OnmsRestService
Commit: 27fa7ea6f46361b4820215c8c055fc7a0b2d8c68
https://github.com/OpenNMS/opennms/commit/27fa7ea6f46361b4820215c8c055fc7a0b2d8c68
Author: Atlassian Bamboo <***@opennms.org>
Date: 2017-07-17 (Mon, 17 Jul 2017)
Changed paths:
M features/vaadin-surveillance-views/src/main/java/org/opennms/features/vaadin/surveillanceviews/service/DefaultSurveillanceViewService.java
Log Message:
-----------
[bamboo] Automated branch merge (from foundation-2017:22ff12d0952cadcbf1ee6fb84f8c0fda1d1935d0)
Commit: bcd9468a08d99bdff8a4d6a962b606e5cde296ec
https://github.com/OpenNMS/opennms/commit/bcd9468a08d99bdff8a4d6a962b606e5cde296ec
Author: Benjamin Reed <***@opennms.org>
Date: 2017-07-18 (Tue, 18 Jul 2017)
Changed paths:
M opennms-webapp-rest/src/main/java/org/opennms/web/rest/v1/OnmsRestService.java
M opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/AlarmRestServiceIT.java
Log Message:
-----------
Merge remote-tracking branch 'origin/foundation' into foundation-2016
Commit: 119a11455d7049fe9032bab19ccde3cc97e91981
https://github.com/OpenNMS/opennms/commit/119a11455d7049fe9032bab19ccde3cc97e91981
Author: DJ Gregor <***@gregor.com>
Date: 2017-07-18 (Tue, 18 Jul 2017)
Changed paths:
A core/daemon/src/test/java/org/opennms/netmgt/daemon/ConditionalActiveMQContextIT.java
R core/daemon/src/test/java/org/opennms/netmgt/daemon/ConditionalActiveMQContextTest.java
A features/poller/monitors/core/src/test/java/org/opennms/netmgt/poller/monitors/DNSResolutionMonitorIT.java
R features/poller/monitors/core/src/test/java/org/opennms/netmgt/poller/monitors/DNSResolutionMonitorTest.java
M features/topology-map/plugins/org.opennms.features.topology.plugins.topo.asset/src/test/java/org/opennms/features/topology/plugins/topo/asset/AssetGraphDefinitionRepositoryTest.java
A opennms-icmp/opennms-icmp-jna/src/test/java/org/opennms/netmgt/icmp/jna/JnaPingIT.java
R opennms-icmp/opennms-icmp-jna/src/test/java/org/opennms/netmgt/icmp/jna/JnaPingTest.java
A opennms-icmp/opennms-icmp-jni/src/test/java/org/opennms/netmgt/icmp/jni/JniPingIT.java
R opennms-icmp/opennms-icmp-jni/src/test/java/org/opennms/netmgt/icmp/jni/JniPingTest.java
A opennms-icmp/opennms-icmp-jni6/src/test/java/org/opennms/netmgt/icmp/jni6/Jni6PingIT.java
R opennms-icmp/opennms-icmp-jni6/src/test/java/org/opennms/netmgt/icmp/jni6/Jni6PingTest.java
Log Message:
-----------
NMS-9514: Rename integration tests that are currently running as unit tests (#1598)
* Rename integration tests that are currently running as unit tests
* Rename integration tests that are currently running as unit tests
* Fix intermittent error if features/topology-map/plugins/org.opennms.features.topology.plugins.topo.asset/target/etc/org.opennms.features.topology.plugins.topo.asset.xml exists
Commit: 0c56b67d6ab312064aff17be5afee974ee2d682a
https://github.com/OpenNMS/opennms/commit/0c56b67d6ab312064aff17be5afee974ee2d682a
Author: Atlassian Bamboo <***@opennms.org>
Date: 2017-07-18 (Tue, 18 Jul 2017)
Changed paths:
M opennms-webapp-rest/src/main/java/org/opennms/web/rest/v1/OnmsRestService.java
M opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/AlarmRestServiceIT.java
Log Message:
-----------
[bamboo] Automated branch merge (from foundation-2016:bcd9468a08d99bdff8a4d6a962b606e5cde296ec)
Commit: 84f3605590f862d4d190fb6aac9e6842ec28ad3c
https://github.com/OpenNMS/opennms/commit/84f3605590f862d4d190fb6aac9e6842ec28ad3c
Author: Atlassian Bamboo <***@opennms.org>
Date: 2017-07-19 (Wed, 19 Jul 2017)
Changed paths:
M opennms-webapp-rest/src/main/java/org/opennms/web/rest/v1/OnmsRestService.java
M opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/AlarmRestServiceIT.java
Log Message:
-----------
[bamboo] Automated branch merge (from foundation-2017:0c56b67d6ab312064aff17be5afee974ee2d682a)
Commit: 422eeb4693e8b4593a3b4b00ec34fbe254bac217
https://github.com/OpenNMS/opennms/commit/422eeb4693e8b4593a3b4b00ec34fbe254bac217
Author: Christian Pape <***@informatik.hs-fulda.de>
Date: 2017-07-23 (Sun, 23 Jul 2017)
Changed paths:
M container/features/pom.xml
M container/features/src/main/resources/features.xml
A core/daemon/src/test/java/org/opennms/netmgt/daemon/ConditionalActiveMQContextIT.java
R core/daemon/src/test/java/org/opennms/netmgt/daemon/ConditionalActiveMQContextTest.java
A features/poller/monitors/core/src/test/java/org/opennms/netmgt/poller/monitors/DNSResolutionMonitorIT.java
R features/poller/monitors/core/src/test/java/org/opennms/netmgt/poller/monitors/DNSResolutionMonitorTest.java
M features/topology-map/plugins/org.opennms.features.topology.plugins.topo.asset/src/test/java/org/opennms/features/topology/plugins/topo/asset/AssetGraphDefinitionRepositoryTest.java
M features/vaadin-surveillance-views/src/main/java/org/opennms/features/vaadin/surveillanceviews/service/DefaultSurveillanceViewService.java
M opennms-doc/guide-development/src/asciidoc/text/rest/alarms.adoc
M opennms-doc/guide-development/src/asciidoc/text/rest/rest-api.adoc
A opennms-icmp/opennms-icmp-jna/src/test/java/org/opennms/netmgt/icmp/jna/JnaPingIT.java
R opennms-icmp/opennms-icmp-jna/src/test/java/org/opennms/netmgt/icmp/jna/JnaPingTest.java
A opennms-icmp/opennms-icmp-jni/src/test/java/org/opennms/netmgt/icmp/jni/JniPingIT.java
R opennms-icmp/opennms-icmp-jni/src/test/java/org/opennms/netmgt/icmp/jni/JniPingTest.java
A opennms-icmp/opennms-icmp-jni6/src/test/java/org/opennms/netmgt/icmp/jni6/Jni6PingIT.java
R opennms-icmp/opennms-icmp-jni6/src/test/java/org/opennms/netmgt/icmp/jni6/Jni6PingTest.java
M opennms-webapp-rest/src/main/java/org/opennms/web/rest/v1/OnmsRestService.java
M opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/AlarmRestServiceIT.java
M opennms-webapp/src/main/webapp/WEB-INF/web.xml
Log Message:
-----------
Merge branch 'develop' into jira/HZN-1112
Compare: https://github.com/OpenNMS/opennms/compare/c00a0eb80475...422eeb4693e8