gmane.network.opennms.cvs http://blog.gmane.org/gmane.network.opennms.cvs hourly 1 1901-01-01T00:00+00:00 Gmane http://gmane.org/img/gmane-25t.png http://gmane.org [OpenNMS/opennms] 2e07dc: NMS-5889 fix system-reportrunning http://permalink.gmane.org/gmane.network.opennms.cvs/29408 <pre> Branch: refs/heads/master Home: https://github.com/OpenNMS/opennms Commit: 2e07dcf52a07c867cf1a4ab88ebc6834f27d73ac https://github.com/OpenNMS/opennms/commit/2e07dcf52a07c867cf1a4ab88ebc6834f27d73ac Author: Benjamin Reed &lt;ranger&lt; at &gt;opennms.org&gt; Date: 2013-05-24 (Fri, 24 May 2013) Changed paths: M opennms-base-assembly/src/main/filtered/bin/system-report Log Message: ----------- NMS-5889 fix system-report running Commit: 3e80630cbee1596dc522f7f03f58f84186534062 https://github.com/OpenNMS/opennms/commit/3e80630cbee1596dc522f7f03f58f84186534062 Author: Benjamin Reed &lt;ranger&lt; at &gt;opennms.org&gt; Date: 2013-05-24 (Fri, 24 May 2013) Changed paths: M opennms-base-assembly/src/main/filtered/bin/system-report Log Message: ----------- Merge branch '1.12' Compare: https://github.com/OpenNMS/opennms/compare/db316cc77fac...3e80630cbee1 ------------------------------------------------------------------------------ Try New Relic Now &amp; We'll Send You this Cool Shirt New Relic is the only SaaS-based application performance monitoring service that delivers powerful full stack analytics. Optimize and monitor your browser, app, &amp; servers with just a few lines of code. Try New Relic and get this awesome Nerd Life shirt! http://p.sf.net/sfu/newrelic_d2d_may_______________________________________________ Please read the OpenNMS Mailing List FAQ: http://www.opennms.org/wiki/index.php?page=MailingListFaq opennms-cvs mailing list To *unsubscribe* or change your subscription options, see the bottom of this page: https://lists.sourceforge.net/lists/listinfo/opennms-cvs</pre> Benjamin Reed 2013-05-24T19:01:36 [OpenNMS/opennms] 2e07dc: NMS-5889 fix system-reportrunning http://permalink.gmane.org/gmane.network.opennms.cvs/29407 <pre> Branch: refs/heads/1.12 Home: https://github.com/OpenNMS/opennms Commit: 2e07dcf52a07c867cf1a4ab88ebc6834f27d73ac https://github.com/OpenNMS/opennms/commit/2e07dcf52a07c867cf1a4ab88ebc6834f27d73ac Author: Benjamin Reed &lt;ranger&lt; at &gt;opennms.org&gt; Date: 2013-05-24 (Fri, 24 May 2013) Changed paths: M opennms-base-assembly/src/main/filtered/bin/system-report Log Message: ----------- NMS-5889 fix system-report running ------------------------------------------------------------------------------ Try New Relic Now &amp; We'll Send You this Cool Shirt New Relic is the only SaaS-based application performance monitoring service that delivers powerful full stack analytics. Optimize and monitor your browser, app, &amp; servers with just a few lines of code. Try New Relic and get this awesome Nerd Life shirt! http://p.sf.net/sfu/newrelic_d2d_may_______________________________________________ Please read the OpenNMS Mailing List FAQ: http://www.opennms.org/wiki/index.php?page=MailingListFaq opennms-cvs mailing list To *unsubscribe* or change your subscription options, see the bottom of this page: https://lists.sourceforge.net/lists/listinfo/opennms-cvs</pre> Benjamin Reed 2013-05-24T18:40:40 [OpenNMS/opennms] e59f48: Fixed a few incorrect titles and added more graph ... http://permalink.gmane.org/gmane.network.opennms.cvs/29406 <pre> Branch: refs/heads/features/linkd-scalability Home: https://github.com/OpenNMS/opennms Commit: e59f48fc4c44b3712531cf60e10261cfa2b2d268 https://github.com/OpenNMS/opennms/commit/e59f48fc4c44b3712531cf60e10261cfa2b2d268 Author: Bobby Krupczak &lt;rdk&lt; at &gt;krupczak.org&gt; Date: 2013-05-20 (Mon, 20 May 2013) Changed paths: M opennms-base-assembly/src/main/filtered/etc/snmp-graph.properties.d/xmp-graph.properties Log Message: ----------- Fixed a few incorrect titles and added more graph entries Commit: 078dedae3d65f6ef6edb801414d338cf28ca00a2 https://github.com/OpenNMS/opennms/commit/078dedae3d65f6ef6edb801414d338cf28ca00a2 Author: Bobby Krupczak &lt;rdk&lt; at &gt;krupczak.org&gt; Date: 2013-05-20 (Mon, 20 May 2013) Changed paths: M core/test-api/xml/src/main/java/org/opennms/core/test/xml/XmlTest.java M opennms-webapp/pom.xml M opennms-webapp/src/main/resources/org/opennms/web/svclayer/applicationContext-svclayer.xml M opennms-webapp/src/test/java/org/opennms/web/rest/AbstractSpringJerseyRestTestCase.java M opennms-webapp/src/test/java/org/opennms/web/rest/AlarmRestServiceTest.java M opennms-webapp/src/test/java/org/opennms/web/rest/AlarmStatsRestServiceTest.java M opennms-webapp/src/test/java/org/opennms/web/rest/NodeRestServiceTest.java A smoke-test/.gitignore M smoke-test/src/test/java/org/opennms/smoketest/DistributedMapTest.java M smoke-test/src/test/java/org/opennms/smoketest/MapPageTest.java M smoke-test/src/test/java/org/opennms/smoketest/ServicePageTest.java Log Message: ----------- Merge branch '1.12' of https://github.com/rdkgit/opennms into 1.12 Commit: 8cc4ca1150b34e0fe4692de02dbb8af564e18dc9 https://github.com/OpenNMS/opennms/commit/8cc4ca1150b34e0fe4692de02dbb8af564e18dc9 Author: Bobby Krupczak &lt;rdk&lt; at &gt;krupczak.org&gt; Date: 2013-05-20 (Mon, 20 May 2013) Changed paths: M opennms-base-assembly/src/main/filtered/etc/snmp-graph.properties.d/xmp-graph.properties Log Message: ----------- Updated xmp graph titles and added more graphs Commit: f9ede728de0bcf8eea4c28f8336ca66523c1d221 https://github.com/OpenNMS/opennms/commit/f9ede728de0bcf8eea4c28f8336ca66523c1d221 Author: Bobby Krupczak &lt;rdk&lt; at &gt;krupczak.org&gt; Date: 2013-05-20 (Mon, 20 May 2013) Changed paths: M protocols/xmp/src/main/etc/xmp-config.xml M protocols/xmp/src/main/etc/xmp-datacollection-config.xml Log Message: ----------- Updated xmp configs to more useful defaults. Commit: 569bddbad9419b9edc82983f3ff2fc28e3c1006d https://github.com/OpenNMS/opennms/commit/569bddbad9419b9edc82983f3ff2fc28e3c1006d Author: Alejandro Galue &lt;agalue&lt; at &gt;opennms.org&gt; Date: 2013-05-22 (Wed, 22 May 2013) Changed paths: M opennms-services/src/main/java/org/opennms/netmgt/poller/monitors/PageSequenceMonitor.java Log Message: ----------- Fix for enhancement NMS-5884 Commit: 747c57e6d616515a8c9128ebcb37e75eae4982bb https://github.com/OpenNMS/opennms/commit/747c57e6d616515a8c9128ebcb37e75eae4982bb Author: Alejandro Galue &lt;agalue&lt; at &gt;opennms.org&gt; Date: 2013-05-22 (Wed, 22 May 2013) Changed paths: M opennms-services/src/main/java/org/opennms/netmgt/poller/monitors/PageSequenceMonitor.java Log Message: ----------- Merge remote-tracking branch 'origin/1.10' into 1.12 Commit: 95ad9ce89c68dd0459b97af5b58c1ec768ec4f40 https://github.com/OpenNMS/opennms/commit/95ad9ce89c68dd0459b97af5b58c1ec768ec4f40 Author: Bobby Krupczak &lt;rdk&lt; at &gt;krupczak.org&gt; Date: 2013-05-22 (Wed, 22 May 2013) Changed paths: M protocols/xmp/src/main/etc/xmp-datacollection-config.xml Log Message: ----------- Fixed includes install.share.dir variable rather than hardcoding location Commit: 9cdb7796ab55741785d10da71030a7070991bda9 https://github.com/OpenNMS/opennms/commit/9cdb7796ab55741785d10da71030a7070991bda9 Author: jeffgdotorg &lt;jeffg&lt; at &gt;opennms.org&gt; Date: 2013-05-22 (Wed, 22 May 2013) Changed paths: M opennms-base-assembly/src/main/filtered/etc/snmp-graph.properties.d/xmp-graph.properties M protocols/xmp/src/main/etc/xmp-config.xml M protocols/xmp/src/main/etc/xmp-datacollection-config.xml Log Message: ----------- Merge pull request #12 from rdkgit/1.12 Taking in Bobby's updated graph definitions and other XMP-related improvements for 1.12. Commit: bed9bc9ba4dac7c9cf46709d28cfc058ab5546fe https://github.com/OpenNMS/opennms/commit/bed9bc9ba4dac7c9cf46709d28cfc058ab5546fe Author: Alejandro Galue &lt;agalue&lt; at &gt;opennms.org&gt; Date: 2013-05-22 (Wed, 22 May 2013) Changed paths: M opennms-base-assembly/src/main/filtered/etc/snmp-graph.properties.d/xmp-graph.properties M protocols/xmp/src/main/etc/xmp-config.xml M protocols/xmp/src/main/etc/xmp-datacollection-config.xml Log Message: ----------- Merge branch '1.12' of github.com:OpenNMS/opennms into 1.12 Commit: 4af8c7b82b5c1afa966e5b4058581fbf960316e3 https://github.com/OpenNMS/opennms/commit/4af8c7b82b5c1afa966e5b4058581fbf960316e3 Author: Seth Leger &lt;seth&lt; at &gt;opennms.org&gt; Date: 2013-05-22 (Wed, 22 May 2013) Changed paths: M features/topology-map/plugins/org.opennms.features.topology.plugins.browsers/src/main/java/org/opennms/features/topology/plugins/browsers/AlarmTable.java Log Message: ----------- Changed caption on deselection link to address bug SPC-567. Commit: a8a3acefa751e84c474bab77cd80eaa8ccc5f9f4 https://github.com/OpenNMS/opennms/commit/a8a3acefa751e84c474bab77cd80eaa8ccc5f9f4 Author: Jeff Gehlbach &lt;jeffg&lt; at &gt;opennms.org&gt; Date: 2013-05-22 (Wed, 22 May 2013) Changed paths: M features/vaadin-snmp-events-and-metrics/src/main/java/org/opennms/features/vaadin/mibcompiler/services/JsmiMibParser.java A features/vaadin-snmp-events-and-metrics/src/test/java/org/opennms/features/vaadin/mibcompiler/SPC592.java A features/vaadin-snmp-events-and-metrics/src/test/resources/DIFFSERV-DSCP-TC.mib A features/vaadin-snmp-events-and-metrics/src/test/resources/DIFFSERV-MIB.mib A features/vaadin-snmp-events-and-metrics/src/test/resources/INET-ADDRESS-MIB.txt A features/vaadin-snmp-events-and-metrics/src/test/resources/INTEGRATED-SERVICES-MIB.mib A features/vaadin-snmp-events-and-metrics/src/test/resources/ISIS-MIB.mib Log Message: ----------- Fix for issue SPC-592 JsmiMibParser was not dropping a trailing .0 from the id mask-element of non-standard trap types per RFC3584 sec 3.2 section 1 bullet 1 sub-bullet 2 (whew), resulting in event masks that failed to match incoming traps. Commit: 90e28f58cd3e777f1bd4b6b5d8ff382139db96d5 https://github.com/OpenNMS/opennms/commit/90e28f58cd3e777f1bd4b6b5d8ff382139db96d5 Author: Benjamin Reed &lt;ranger&lt; at &gt;opennms.org&gt; Date: 2013-05-22 (Wed, 22 May 2013) Changed paths: M features/vaadin-snmp-events-and-metrics/src/main/java/org/opennms/features/vaadin/mibcompiler/services/JsmiMibParser.java A features/vaadin-snmp-events-and-metrics/src/test/java/org/opennms/features/vaadin/mibcompiler/SPC592.java A features/vaadin-snmp-events-and-metrics/src/test/resources/DIFFSERV-DSCP-TC.mib A features/vaadin-snmp-events-and-metrics/src/test/resources/DIFFSERV-MIB.mib A features/vaadin-snmp-events-and-metrics/src/test/resources/INET-ADDRESS-MIB.txt A features/vaadin-snmp-events-and-metrics/src/test/resources/INTEGRATED-SERVICES-MIB.mib A features/vaadin-snmp-events-and-metrics/src/test/resources/ISIS-MIB.mib M opennms-base-assembly/src/main/filtered/etc/snmp-graph.properties.d/xmp-graph.properties M opennms-services/src/main/java/org/opennms/netmgt/poller/monitors/PageSequenceMonitor.java M protocols/xmp/src/main/etc/xmp-config.xml M protocols/xmp/src/main/etc/xmp-datacollection-config.xml Log Message: ----------- Merge branch '1.12' Commit: 76275a3e15926abf9ccf8f3a2b99a03cb732bd33 https://github.com/OpenNMS/opennms/commit/76275a3e15926abf9ccf8f3a2b99a03cb732bd33 Author: Jeff Gehlbach &lt;jeffg&lt; at &gt;opennms.org&gt; Date: 2013-05-22 (Wed, 22 May 2013) Changed paths: M opennms-base-assembly/src/main/filtered/etc/opennms.properties Log Message: ----------- Fix NMS-5886: Distributed map popup unknown map implementation on new install Commit: 42a67d9474d68473e60381d7d82a673f55889f82 https://github.com/OpenNMS/opennms/commit/42a67d9474d68473e60381d7d82a673f55889f82 Author: Markus von Rüden &lt;mvr&lt; at &gt;opennms.com&gt; Date: 2013-05-23 (Thu, 23 May 2013) Changed paths: M opennms-webapp/src/main/java/org/opennms/web/rest/OnmsRestService.java Log Message: ----------- Fix of #SPC-480 Commit: 61c353900a06f235229db25b28bc37846aa4d31b https://github.com/OpenNMS/opennms/commit/61c353900a06f235229db25b28bc37846aa4d31b Author: Markus von Rüden &lt;mvr&lt; at &gt;opennms.com&gt; Date: 2013-05-23 (Thu, 23 May 2013) Changed paths: M opennms-dao/src/main/java/org/opennms/netmgt/dao/hibernate/AlarmRepositoryHibernate.java M opennms-webapp/src/main/java/org/opennms/web/controller/alarm/AlarmDetailController.java M opennms-webapp/src/main/webapp/WEB-INF/dispatcher-servlet.xml M opennms-webapp/src/main/webapp/WEB-INF/jsp/alarm/detail.jsp Log Message: ----------- Fix of alarm page: Clear of Memos did not work anymore Commit: c4e337d300ca0ceca70f9f268d087c8fd34f96db https://github.com/OpenNMS/opennms/commit/c4e337d300ca0ceca70f9f268d087c8fd34f96db Author: Seth Leger &lt;seth&lt; at &gt;opennms.org&gt; Date: 2013-05-23 (Thu, 23 May 2013) Changed paths: A features/topology-map/plugins/org.opennms.features.topology.plugins.browsers/src/main/java/org/opennms/features/topology/plugins/browsers/NodeTable.java M features/topology-map/plugins/org.opennms.features.topology.plugins.browsers/src/main/java/org/opennms/features/topology/plugins/browsers/OnmsDaoContainer.java M features/topology-map/plugins/org.opennms.features.topology.plugins.browsers/src/main/resources/OSGI-INF/blueprint/blueprint.xml Log Message: ----------- Added ability to perform additional Comparator-based sorting inside the OnmsDaoContainer so that we can sort on properties that are &lt; at &gt;Transient and cannot easily be sorted in the database with Hibernate. Addresses bug SPC-579. Commit: a72a63caecf77a30f742fa2fd0567184dd945ddb https://github.com/OpenNMS/opennms/commit/a72a63caecf77a30f742fa2fd0567184dd945ddb Author: Benjamin Reed &lt;ranger&lt; at &gt;opennms.org&gt; Date: 2013-05-23 (Thu, 23 May 2013) Changed paths: M opennms-model/src/main/java/org/opennms/netmgt/model/OnmsAssetRecord.java Log Message: ----------- Work around JAXB/JDK7 issue http://bamboo.internal.opennms.com:8085/browse/OPENNMS-MASTER17-TEST-89 Commit: 08fdb116327b175c6faa99f6f983d8b9ac79bf93 https://github.com/OpenNMS/opennms/commit/08fdb116327b175c6faa99f6f983d8b9ac79bf93 Author: Benjamin Reed &lt;ranger&lt; at &gt;opennms.org&gt; Date: 2013-05-23 (Thu, 23 May 2013) Changed paths: M opennms-base-assembly/src/main/filtered/etc/opennms.properties M opennms-model/src/main/java/org/opennms/netmgt/model/OnmsAssetRecord.java Log Message: ----------- Merge branch '1.12' Commit: 66a2d1558a4b58b504ae23821264ea74ac76c456 https://github.com/OpenNMS/opennms/commit/66a2d1558a4b58b504ae23821264ea74ac76c456 Author: Benjamin Reed &lt;ranger&lt; at &gt;opennms.org&gt; Date: 2013-05-23 (Thu, 23 May 2013) Changed paths: A opennms-model/src/main/java/org/opennms/netmgt/model/OnmsAnyTypeAdapter.java Log Message: ----------- forgot to add this for the previous fix Commit: c99c2fbfa957c643a42726fd354501897c9e3959 https://github.com/OpenNMS/opennms/commit/c99c2fbfa957c643a42726fd354501897c9e3959 Author: Benjamin Reed &lt;ranger&lt; at &gt;opennms.org&gt; Date: 2013-05-23 (Thu, 23 May 2013) Changed paths: A opennms-model/src/main/java/org/opennms/netmgt/model/OnmsAnyTypeAdapter.java Log Message: ----------- Merge branch '1.12' Commit: 3eead2b97e857fbcdf3b7d8cb9e6e3aab252d59f https://github.com/OpenNMS/opennms/commit/3eead2b97e857fbcdf3b7d8cb9e6e3aab252d59f Author: Benjamin Reed &lt;ranger&lt; at &gt;opennms.org&gt; Date: 2013-05-23 (Thu, 23 May 2013) Changed paths: M opennms-icmp/opennms-icmp-jni/pom.xml Log Message: ----------- jicmp 1.4.1 dependency Commit: 44bf5f46b75489c529fc304de177e8ed9b9a6d10 https://github.com/OpenNMS/opennms/commit/44bf5f46b75489c529fc304de177e8ed9b9a6d10 Author: Benjamin Reed &lt;ranger&lt; at &gt;opennms.org&gt; Date: 2013-05-23 (Thu, 23 May 2013) Changed paths: M opennms-icmp/opennms-icmp-jni/pom.xml Log Message: ----------- Merge branch '1.12' Commit: e45ca73313af27113727444dd74b912da1a1b1b7 https://github.com/OpenNMS/opennms/commit/e45ca73313af27113727444dd74b912da1a1b1b7 Author: Seth Leger &lt;seth&lt; at &gt;opennms.org&gt; Date: 2013-05-23 (Thu, 23 May 2013) Changed paths: M opennms-dao/src/main/java/org/opennms/netmgt/dao/hibernate/IpInterfaceDaoHibernate.java M opennms-model/src/main/java/org/opennms/netmgt/model/OnmsNode.java Log Message: ----------- Added a comparator to the getPrimaryInterface() method of OnmsNode so that the most recently scanned interface is always returned. Commit: 92d3e0eee6cdb7527ff32cffced5cb6f2cb9d644 https://github.com/OpenNMS/opennms/commit/92d3e0eee6cdb7527ff32cffced5cb6f2cb9d644 Author: Markus von Rüden &lt;mvr&lt; at &gt;opennms.com&gt; Date: 2013-05-23 (Thu, 23 May 2013) Changed paths: M opennms-webapp/src/main/java/org/opennms/web/rest/OnmsRestService.java Log Message: ----------- Fix of #SPC-480 Commit: df3f73368207c2608acca75f42f6b87d487df63b https://github.com/OpenNMS/opennms/commit/df3f73368207c2608acca75f42f6b87d487df63b Author: Seth Leger &lt;seth&lt; at &gt;opennms.org&gt; Date: 2013-05-23 (Thu, 23 May 2013) Changed paths: M features/topology-map/plugins/org.opennms.features.topology.plugins.browsers/src/main/java/org/opennms/features/topology/plugins/browsers/NodeTable.java Log Message: ----------- Added reversible sorting to the primaryInterface sorting in NodeTable. Commit: 478a7e5dc901bb79ad12fe06fc66d18dd7f21bf4 https://github.com/OpenNMS/opennms/commit/478a7e5dc901bb79ad12fe06fc66d18dd7f21bf4 Author: Seth Leger &lt;seth&lt; at &gt;opennms.org&gt; Date: 2013-05-23 (Thu, 23 May 2013) Changed paths: M features/topology-map/plugins/org.opennms.features.topology.plugins.browsers/src/main/java/org/opennms/features/topology/plugins/browsers/NodeTable.java Log Message: ----------- Added some calls to internal com.vaadin.ui.Table functions so that the sort column indicators are refreshed when sorting on the primaryInterface column. Unfortunately, this doesn't style the primaryInterface column but it does reset the styles on the other columns. Commit: 35c293011769000c91c857da288531d939ed9447 https://github.com/OpenNMS/opennms/commit/35c293011769000c91c857da288531d939ed9447 Author: Donald Desloge &lt;desloge&lt; at &gt;opennms.com&gt; Date: 2013-05-23 (Thu, 23 May 2013) Changed paths: M features/topology-map/plugins/org.opennms.features.topology.plugins.topo.linkd/src/main/java/org/opennms/features/topology/plugins/topo/linkd/internal/LinkdTopologyProvider.java Log Message: ----------- update how we calculate the link status for edges in linkd topo provider Commit: ce754b82f8387317af67418d305a7d15fc962fdc https://github.com/OpenNMS/opennms/commit/ce754b82f8387317af67418d305a7d15fc962fdc Author: Seth Leger &lt;seth&lt; at &gt;opennms.org&gt; Date: 2013-05-23 (Thu, 23 May 2013) Changed paths: M features/topology-map/plugins/org.opennms.features.topology.plugins.browsers/src/main/java/org/opennms/features/topology/plugins/browsers/NodeDaoContainer.java M features/topology-map/plugins/org.opennms.features.topology.plugins.browsers/src/main/java/org/opennms/features/topology/plugins/browsers/NodeTable.java Log Message: ----------- Updated NodeDaoContainer so that it doesn't set the primaryInterface column as non-sortable so that it still applies the sorting CSS styles when our HeaderClickListener changes the sorting. Fixes bug SPC-579. Commit: 946a7c6d74de954a78535575beb9ae67c610c806 https://github.com/OpenNMS/opennms/commit/946a7c6d74de954a78535575beb9ae67c610c806 Author: Seth Leger &lt;seth&lt; at &gt;opennms.org&gt; Date: 2013-05-23 (Thu, 23 May 2013) Changed paths: M features/topology-map/plugins/org.opennms.features.topology.plugins.browsers/src/main/java/org/opennms/features/topology/plugins/browsers/NodeTable.java Log Message: ----------- Reversed the sorting of nulls and the asc/desc indicator to make primaryInterface match the other string fields in a Container. Commit: 08098bbb71b96681c095bacdc39141d20b14e02e https://github.com/OpenNMS/opennms/commit/08098bbb71b96681c095bacdc39141d20b14e02e Author: Benjamin Reed &lt;ranger&lt; at &gt;opennms.org&gt; Date: 2013-05-23 (Thu, 23 May 2013) Changed paths: M opennms-base-assembly/src/main/filtered/bin/opennms Log Message: ----------- allow overriding opennms.conf with a user-specific file Commit: db316cc77fac3e97045f710fe69928207b92d2aa https://github.com/OpenNMS/opennms/commit/db316cc77fac3e97045f710fe69928207b92d2aa Author: Benjamin Reed &lt;ranger&lt; at &gt;opennms.org&gt; Date: 2013-05-23 (Thu, 23 May 2013) Changed paths: M opennms-base-assembly/src/main/filtered/bin/opennms Log Message: ----------- Merge branch '1.12' Commit: 2726b2079ea0b16d38c399b20f0977708957b526 https://github.com/OpenNMS/opennms/commit/2726b2079ea0b16d38c399b20f0977708957b526 Author: Antonio &lt;rssntn67&lt; at &gt;yahoo.it&gt; Date: 2013-05-24 (Fri, 24 May 2013) Changed paths: M features/topology-map/plugins/org.opennms.features.topology.plugins.browsers/src/main/java/org/opennms/features/topology/plugins/browsers/AlarmTable.java M features/topology-map/plugins/org.opennms.features.topology.plugins.browsers/src/main/java/org/opennms/features/topology/plugins/browsers/NodeDaoContainer.java A features/topology-map/plugins/org.opennms.features.topology.plugins.browsers/src/main/java/org/opennms/features/topology/plugins/browsers/NodeTable.java M features/topology-map/plugins/org.opennms.features.topology.plugins.browsers/src/main/java/org/opennms/features/topology/plugins/browsers/OnmsDaoContainer.java M features/topology-map/plugins/org.opennms.features.topology.plugins.browsers/src/main/resources/OSGI-INF/blueprint/blueprint.xml M features/topology-map/plugins/org.opennms.features.topology.plugins.topo.linkd/src/main/java/org/opennms/features/topology/plugins/topo/linkd/internal/LinkdTopologyProvider.java M features/vaadin-snmp-events-and-metrics/src/main/java/org/opennms/features/vaadin/mibcompiler/services/JsmiMibParser.java A features/vaadin-snmp-events-and-metrics/src/test/java/org/opennms/features/vaadin/mibcompiler/SPC592.java A features/vaadin-snmp-events-and-metrics/src/test/resources/DIFFSERV-DSCP-TC.mib A features/vaadin-snmp-events-and-metrics/src/test/resources/DIFFSERV-MIB.mib A features/vaadin-snmp-events-and-metrics/src/test/resources/INET-ADDRESS-MIB.txt A features/vaadin-snmp-events-and-metrics/src/test/resources/INTEGRATED-SERVICES-MIB.mib A features/vaadin-snmp-events-and-metrics/src/test/resources/ISIS-MIB.mib M opennms-base-assembly/src/main/filtered/bin/opennms M opennms-base-assembly/src/main/filtered/etc/opennms.properties M opennms-base-assembly/src/main/filtered/etc/snmp-graph.properties.d/xmp-graph.properties M opennms-dao/src/main/java/org/opennms/netmgt/dao/hibernate/AlarmRepositoryHibernate.java M opennms-dao/src/main/java/org/opennms/netmgt/dao/hibernate/IpInterfaceDaoHibernate.java M opennms-icmp/opennms-icmp-jni/pom.xml A opennms-model/src/main/java/org/opennms/netmgt/model/OnmsAnyTypeAdapter.java M opennms-model/src/main/java/org/opennms/netmgt/model/OnmsAssetRecord.java M opennms-model/src/main/java/org/opennms/netmgt/model/OnmsNode.java M opennms-services/src/main/java/org/opennms/netmgt/poller/monitors/PageSequenceMonitor.java M opennms-webapp/src/main/java/org/opennms/web/controller/alarm/AlarmDetailController.java M opennms-webapp/src/main/java/org/opennms/web/rest/OnmsRestService.java M opennms-webapp/src/main/webapp/WEB-INF/dispatcher-servlet.xml M opennms-webapp/src/main/webapp/WEB-INF/jsp/alarm/detail.jsp M protocols/xmp/src/main/etc/xmp-config.xml M protocols/xmp/src/main/etc/xmp-datacollection-config.xml Log Message: ----------- Merge branch 'master' into features/linkd-scalability Commit: 89cabaeca1b754f95e35e6b3634f5d8d0fb79a4c https://github.com/OpenNMS/opennms/commit/89cabaeca1b754f95e35e6b3634f5d8d0fb79a4c Author: Antonio &lt;rssntn67&lt; at &gt;yahoo.it&gt; Date: 2013-05-24 (Fri, 24 May 2013) Changed paths: M opennms-dao/src/main/java/org/opennms/netmgt/dao/TopologyDao.java M opennms-linkd/enhanced-linkd/src/main/java/org/opennms/netmgt/enlinkd/EnhancedLinkdServiceImpl.java M opennms-linkd/enhanced-linkd/src/main/java/org/opennms/netmgt/enlinkd/PseudoBridgeHelper.java M opennms-linkd/enhanced-linkd/src/test/java/org/opennms/netmgt/enlinkd/DefaultServiceTest.java M opennms-linkd/enhanced-linkd/src/test/java/org/opennms/netmgt/enlinkd/Nms17216SnmpTest.java Log Message: ----------- TLE-23 Junit Tests Added new tests for Default Enhanced Linkd Service Simplified the layout of the merge and split for discovery topology Removed unused method on the PseudoBridgeHelper class Compare: https://github.com/OpenNMS/opennms/compare/8f905c5e790e...89cabaeca1b7 ------------------------------------------------------------------------------ Try New Relic Now &amp; We'll Send You this Cool Shirt New Relic is the only SaaS-based application performance monitoring service that delivers powerful full stack analytics. Optimize and monitor your browser, app, &amp; servers with just a few lines of code. Try New Relic and get this awesome Nerd Life shirt! http://p.sf.net/sfu/newrelic_d2d_may_______________________________________________ Please read the OpenNMS Mailing List FAQ: http://www.opennms.org/wiki/index.php?page=MailingListFaq opennms-cvs mailing list To *unsubscribe* or change your subscription options, see the bottom of this page: https://lists.sourceforge.net/lists/listinfo/opennms-cvs</pre> Antonio 2013-05-24T17:02:55 [OpenNMS/opennms] 4f1831: Fix for enhancement NMS-5876 http://permalink.gmane.org/gmane.network.opennms.cvs/29405 <pre> Branch: refs/heads/smnnepo Home: https://github.com/OpenNMS/opennms Commit: 4f1831fecbc973219dce4ffb14224d6caf2e6458 https://github.com/OpenNMS/opennms/commit/4f1831fecbc973219dce4ffb14224d6caf2e6458 Author: Alejandro Galue &lt;agalue&lt; at &gt;opennms.org&gt; Date: 2013-05-14 (Tue, 14 May 2013) Changed paths: M opennms-webapp/src/main/webapp/element/interface.jsp M opennms-webapp/src/main/webapp/element/service.jsp Log Message: ----------- Fix for enhancement NMS-5876 Commit: 6009fca068f765cc772247e720e6e1cca2d27fb6 https://github.com/OpenNMS/opennms/commit/6009fca068f765cc772247e720e6e1cca2d27fb6 Author: Alejandro Galue &lt;agalue&lt; at &gt;opennms.org&gt; Date: 2013-05-14 (Tue, 14 May 2013) Changed paths: M opennms-webapp/src/main/webapp/includes/header.jsp Log Message: ----------- Merge branch '1.10' of github.com:OpenNMS/opennms into 1.10 Commit: bc3e5d6495388bc6cb5b6f1d664524aa27c9db54 https://github.com/OpenNMS/opennms/commit/bc3e5d6495388bc6cb5b6f1d664524aa27c9db54 Author: Benjamin Reed &lt;ranger&lt; at &gt;opennms.org&gt; Date: 2013-05-14 (Tue, 14 May 2013) Changed paths: M opennms-rrd/opennms-rrd-jrobin/src/main/java/org/opennms/netmgt/rrd/jrobin/JRobinRrdStrategy.java Log Message: ----------- change read-only calls to use the read-only version of RrdDb Commit: ac0b060086f3ed60d356b4d69c05df74a9a24ef0 https://github.com/OpenNMS/opennms/commit/ac0b060086f3ed60d356b4d69c05df74a9a24ef0 Author: Seth Leger &lt;seth&lt; at &gt;opennms.org&gt; Date: 2013-05-14 (Tue, 14 May 2013) Changed paths: M opennms-qosdaemon/src/main/java/org/openoss/opennms/spring/qosd/ejb/AlarmListJ2eeConnectionManagerThread.java M opennms-services/src/main/java/org/opennms/netmgt/capsd/SmbUtils.java M opennms-webapp/src/main/java/org/opennms/web/report/database/DeliveryOptionsValidator.java Log Message: ----------- Fixed some typos in boolean operations (| versus ||). Commit: 25dc785837d3e8b49981bc6853b23b9f6254a559 https://github.com/OpenNMS/opennms/commit/25dc785837d3e8b49981bc6853b23b9f6254a559 Author: Seth Leger &lt;seth&lt; at &gt;opennms.org&gt; Date: 2013-05-14 (Tue, 14 May 2013) Changed paths: M core/snmp/joesnmp/src/main/java/org/opennms/protocols/snmp/SnmpCounter64.java M core/snmp/joesnmp/src/main/java/org/opennms/protocols/snmp/SnmpSession.java M core/snmp/joesnmp/src/main/java/org/opennms/protocols/snmp/SnmpTrapSession.java Log Message: ----------- Got rid of unused why/threadException fields in SnmpSession and fixed input validation in SnmpCounter64. Commit: 38586b1cd095ba57e7582db4ae99bf21d4bac218 https://github.com/OpenNMS/opennms/commit/38586b1cd095ba57e7582db4ae99bf21d4bac218 Author: Seth Leger &lt;seth&lt; at &gt;opennms.org&gt; Date: 2013-05-14 (Tue, 14 May 2013) Changed paths: M opennms-services/src/main/java/org/opennms/netmgt/vacuumd/Transaction.java M opennms-webapp/src/main/java/org/opennms/web/admin/users/parsers/DutySchedule.java Log Message: ----------- Fixed some basic Java API problems (Cloneable, protected finalize) in two classes. Commit: 7166d5a9fcea725379ea52917c325b04c7b5fdb1 https://github.com/OpenNMS/opennms/commit/7166d5a9fcea725379ea52917c325b04c7b5fdb1 Author: Seth Leger &lt;seth&lt; at &gt;opennms.org&gt; Date: 2013-05-14 (Tue, 14 May 2013) Changed paths: M opennms-webapp/src/main/java/org/opennms/web/rest/ISO8601DateEditor.java Log Message: ----------- Fixed date parsing from a long string value. Commit: 3003fc98afa1885e974dddced3406f47517f3ef5 https://github.com/OpenNMS/opennms/commit/3003fc98afa1885e974dddced3406f47517f3ef5 Author: Seth Leger &lt;seth&lt; at &gt;opennms.org&gt; Date: 2013-05-14 (Tue, 14 May 2013) Changed paths: M protocols/dhcp/src/main/java/org/opennms/netmgt/dhcpd/Message.java Log Message: ----------- Changed read() call to readFully() to make sure we get all of the bytes that we expect. Commit: 1bb42c2c51ac67c91257b247d8915d5c73d606c2 https://github.com/OpenNMS/opennms/commit/1bb42c2c51ac67c91257b247d8915d5c73d606c2 Author: Seth Leger &lt;seth&lt; at &gt;opennms.org&gt; Date: 2013-05-14 (Tue, 14 May 2013) Changed paths: M features/acl/src/main/java/org/opennms/acl/ui/UserController.java M features/ncs/ncs-northbounder/src/main/java/org/opennms/netmgt/ncs/northbounder/NCSNorthbounderManager.java M features/remote-poller-gwt/src/main/java/org/opennms/features/poller/remote/gwt/client/OpenLayersMapPanel.java M features/reporting/availability/src/main/java/org/opennms/reporting/availability/AvailabilityData.java M integrations/opennms-link-provisioning-adapter/src/main/java/org/opennms/netmgt/provision/adapters/link/DefaultNodeLinkService.java M opennms-config-model/src/main/java/org/opennms/netmgt/eventd/datablock/EventKey.java M opennms-config/src/main/java/org/opennms/netmgt/config/BasicScheduleUtils.java M opennms-config/src/main/java/org/opennms/netmgt/config/MibObject.java M opennms-config/src/main/java/org/opennms/netmgt/config/WebSchedEntry.java M opennms-model/src/main/java/org/opennms/netmgt/model/discovery/IPPollAddress.java M opennms-services/src/main/java/org/opennms/netmgt/linkd/DiscoveryLink.java M opennms-services/src/main/java/org/opennms/netmgt/linkd/SnmpCollection.java M opennms-services/src/main/java/org/opennms/netmgt/linkd/scheduler/ReadyRunnable.java M opennms-services/src/main/java/org/opennms/netmgt/linkd/scheduler/Scheduler.java M opennms-services/src/main/java/org/opennms/netmgt/poller/remote/support/DefaultPollerBackEnd.java M opennms-test/src/main/java/org/opennms/test/DaoTestConfigBean.java M opennms-util/src/main/java/org/opennms/core/resource/db/SimpleDbConnectionFactory.java M opennms-web-api/src/main/java/org/opennms/web/servlet/ServletInitializer.java Log Message: ----------- Fixed null checks, removed some unused null fields in some classes, and fixed classes that override equals() incorrectly. Commit: f539c5393a4187424160d4a1d25b20f595f679c7 https://github.com/OpenNMS/opennms/commit/f539c5393a4187424160d4a1d25b20f595f679c7 Author: Alejandro Galue &lt;agalue&lt; at &gt;opennms.org&gt; Date: 2013-05-15 (Wed, 15 May 2013) Changed paths: M opennms-rrd/opennms-rrd-jrobin/src/main/java/org/opennms/netmgt/rrd/jrobin/JRobinRrdStrategy.java M opennms-webapp/src/main/webapp/WEB-INF/jsp/element/service.jsp M opennms-webapp/src/main/webapp/element/interface.jsp Log Message: ----------- Merge remote-tracking branch 'origin/1.10' into 1.12 The file service.jsp doesn't exist on 1.12, it was reworked to use Spring MVC style, so the original solution was ported to the correct syntax on opennms-webapp/src/main/webapp/WEB-INF/jsp/service.jsp Conflicts: opennms-webapp/src/main/webapp/element/service.jsp Commit: 76413d0a9c1825f9add64c5f18ec50f79eb70df7 https://github.com/OpenNMS/opennms/commit/76413d0a9c1825f9add64c5f18ec50f79eb70df7 Author: Markus von Rüden &lt;mvr&lt; at &gt;opennms.com&gt; Date: 2013-05-15 (Wed, 15 May 2013) Changed paths: M features/topology-map/org.opennms.features.topology.api/src/main/java/org/opennms/features/topology/api/topo/AbstractTopologyProvider.java M features/topology-map/org.opennms.features.topology.app/src/test/java/org/opennms/features/topology/app/internal/operations/GroupOperationsTest.java M features/topology-map/plugins/org.opennms.features.topology.plugins.topo.linkd/src/test/java/org/opennms/features/topology/plugins/topo/linkd/internal/LinkdTopologyProviderTest.java Log Message: ----------- Added javadoc and some minor changes Commit: 76e41f3d1e2f11d4b1fca65d033c259a37d533ca https://github.com/OpenNMS/opennms/commit/76e41f3d1e2f11d4b1fca65d033c259a37d533ca Author: Markus von Rüden &lt;mvr&lt; at &gt;opennms.com&gt; Date: 2013-05-15 (Wed, 15 May 2013) Changed paths: M core/snmp/joesnmp/src/main/java/org/opennms/protocols/snmp/SnmpCounter64.java M core/snmp/joesnmp/src/main/java/org/opennms/protocols/snmp/SnmpSession.java M core/snmp/joesnmp/src/main/java/org/opennms/protocols/snmp/SnmpTrapSession.java M features/acl/src/main/java/org/opennms/acl/ui/UserController.java M features/ncs/ncs-northbounder/src/main/java/org/opennms/netmgt/ncs/northbounder/NCSNorthbounderManager.java M features/remote-poller-gwt/src/main/java/org/opennms/features/poller/remote/gwt/client/OpenLayersMapPanel.java M features/reporting/availability/src/main/java/org/opennms/reporting/availability/AvailabilityData.java M integrations/opennms-link-provisioning-adapter/src/main/java/org/opennms/netmgt/provision/adapters/link/DefaultNodeLinkService.java M opennms-config-model/src/main/java/org/opennms/netmgt/eventd/datablock/EventKey.java M opennms-config/src/main/java/org/opennms/netmgt/config/BasicScheduleUtils.java M opennms-config/src/main/java/org/opennms/netmgt/config/MibObject.java M opennms-config/src/main/java/org/opennms/netmgt/config/WebSchedEntry.java M opennms-model/src/main/java/org/opennms/netmgt/model/discovery/IPPollAddress.java M opennms-qosdaemon/src/main/java/org/openoss/opennms/spring/qosd/ejb/AlarmListJ2eeConnectionManagerThread.java M opennms-services/src/main/java/org/opennms/netmgt/capsd/SmbUtils.java M opennms-services/src/main/java/org/opennms/netmgt/linkd/DiscoveryLink.java M opennms-services/src/main/java/org/opennms/netmgt/linkd/SnmpCollection.java M opennms-services/src/main/java/org/opennms/netmgt/linkd/scheduler/ReadyRunnable.java M opennms-services/src/main/java/org/opennms/netmgt/linkd/scheduler/Scheduler.java M opennms-services/src/main/java/org/opennms/netmgt/poller/remote/support/DefaultPollerBackEnd.java M opennms-services/src/main/java/org/opennms/netmgt/vacuumd/Transaction.java M opennms-test/src/main/java/org/opennms/test/DaoTestConfigBean.java M opennms-util/src/main/java/org/opennms/core/resource/db/SimpleDbConnectionFactory.java M opennms-web-api/src/main/java/org/opennms/web/servlet/ServletInitializer.java M opennms-webapp/src/main/java/org/opennms/web/admin/users/parsers/DutySchedule.java M opennms-webapp/src/main/java/org/opennms/web/report/database/DeliveryOptionsValidator.java M opennms-webapp/src/main/java/org/opennms/web/rest/ISO8601DateEditor.java M protocols/dhcp/src/main/java/org/opennms/netmgt/dhcpd/Message.java Log Message: ----------- Merge branch 'master' of github.com:OpenNMS/opennms Commit: 9549a3042218940d3e3a7421720efbeec6f9387c https://github.com/OpenNMS/opennms/commit/9549a3042218940d3e3a7421720efbeec6f9387c Author: Alejandro Galue &lt;agalue&lt; at &gt;opennms.org&gt; Date: 2013-05-15 (Wed, 15 May 2013) Changed paths: M opennms-webapp/src/main/webapp/WEB-INF/jsp/alarm/list.jsp Log Message: ----------- Adjusting the column sizes on WEB-INF/jsp/alarm/list.jsp The size of 'Log Msg' has been increased in 8% The size of 'ID/Severity' has been reduced in 1% The size of 'Last Event Time' has been reduced in 7% Commit: 78bf5406ffac82eb9d4d94710076ea073ddf7023 https://github.com/OpenNMS/opennms/commit/78bf5406ffac82eb9d4d94710076ea073ddf7023 Author: Markus Neumann &lt;Markus&lt; at &gt;OpenNMS.org&gt; Date: 2013-05-15 (Wed, 15 May 2013) Changed paths: M opennms-webapp/src/main/java/org/opennms/web/rest/OnmsRestService.java Log Message: ----------- fixed NOSONAR comment Commit: 9cb829ea741a23ebda9bea8271766acc441e3228 https://github.com/OpenNMS/opennms/commit/9cb829ea741a23ebda9bea8271766acc441e3228 Author: Markus Neumann &lt;Markus&lt; at &gt;OpenNMS.org&gt; Date: 2013-05-15 (Wed, 15 May 2013) Changed paths: M core/snmp/joesnmp/src/main/java/org/opennms/protocols/snmp/SnmpCounter64.java M core/snmp/joesnmp/src/main/java/org/opennms/protocols/snmp/SnmpSession.java M core/snmp/joesnmp/src/main/java/org/opennms/protocols/snmp/SnmpTrapSession.java M debian/rules M features/acl/src/main/java/org/opennms/acl/ui/UserController.java M features/ncs/ncs-northbounder/src/main/java/org/opennms/netmgt/ncs/northbounder/NCSNorthbounderManager.java M features/remote-poller-gwt/src/main/java/org/opennms/features/poller/remote/gwt/client/OpenLayersMapPanel.java M features/reporting/availability/src/main/java/org/opennms/reporting/availability/AvailabilityData.java M features/topology-map/org.opennms.features.topology.api/pom.xml M features/topology-map/org.opennms.features.topology.api/src/main/java/org/opennms/features/topology/api/topo/AbstractTopologyProvider.java M features/topology-map/org.opennms.features.topology.api/src/main/java/org/opennms/features/topology/api/topo/SimpleGroup.java A features/topology-map/org.opennms.features.topology.api/src/test/java/org/opennms/features/topology/api/topo/AbstractTopologyProviderTest.java M features/topology-map/org.opennms.features.topology.app/src/main/java/org/opennms/features/topology/app/internal/TopologyWidgetTestApplication.java M features/topology-map/org.opennms.features.topology.app/src/main/java/org/opennms/features/topology/app/internal/gwt/client/VTopologyComponent.java A features/topology-map/org.opennms.features.topology.app/src/test/java/org/opennms/features/topology/app/internal/GCFilterableContainerTest.java M features/topology-map/org.opennms.features.topology.app/src/test/java/org/opennms/features/topology/app/internal/operations/GroupOperationsTest.java M features/topology-map/plugins/org.opennms.features.topology.plugins.topo.linkd/src/main/java/org/opennms/features/topology/plugins/topo/linkd/internal/LinkdTopologyProvider.java M features/topology-map/plugins/org.opennms.features.topology.plugins.topo.linkd/src/test/java/org/opennms/features/topology/plugins/topo/linkd/internal/EasyMockDataPopulator.java M features/topology-map/plugins/org.opennms.features.topology.plugins.topo.linkd/src/test/java/org/opennms/features/topology/plugins/topo/linkd/internal/LinkdTopologyProviderTest.java A features/topology-map/plugins/org.opennms.features.topology.plugins.topo.linkd/src/test/resources/saved-linkd-graph2.xml M features/topology-map/plugins/org.opennms.features.topology.plugins.topo.simple/src/main/java/org/opennms/features/topology/plugins/topo/simple/SimpleGraphProvider.java M features/topology-map/plugins/org.opennms.features.topology.plugins.topo.vmware/src/main/java/org/opennms/features/topology/plugins/topo/vmware/internal/VmwareTopologyProvider.java M integrations/opennms-link-provisioning-adapter/src/main/java/org/opennms/netmgt/provision/adapters/link/DefaultNodeLinkService.java M opennms-base-assembly/src/main/filtered/etc/access-point-monitor-configuration.xml M opennms-base-assembly/src/main/filtered/etc/vacuumd-configuration.xml M opennms-config-model/src/main/java/org/opennms/netmgt/eventd/datablock/EventKey.java M opennms-config/src/main/java/org/opennms/netmgt/config/BasicScheduleUtils.java M opennms-config/src/main/java/org/opennms/netmgt/config/MibObject.java M opennms-config/src/main/java/org/opennms/netmgt/config/WebSchedEntry.java M opennms-icmp/opennms-icmp-jni/pom.xml M opennms-icmp/opennms-icmp-jni/src/main/java/org/opennms/netmgt/icmp/jni/JniPingRequest.java M opennms-model/src/main/java/org/opennms/netmgt/model/discovery/IPPollAddress.java M opennms-qosdaemon/src/main/java/org/openoss/opennms/spring/qosd/ejb/AlarmListJ2eeConnectionManagerThread.java M opennms-services/src/main/java/org/opennms/netmgt/capsd/SmbUtils.java M opennms-services/src/main/java/org/opennms/netmgt/linkd/DiscoveryLink.java M opennms-services/src/main/java/org/opennms/netmgt/linkd/SnmpCollection.java M opennms-services/src/main/java/org/opennms/netmgt/linkd/scheduler/ReadyRunnable.java M opennms-services/src/main/java/org/opennms/netmgt/linkd/scheduler/Scheduler.java M opennms-services/src/main/java/org/opennms/netmgt/poller/remote/support/DefaultPollerBackEnd.java M opennms-services/src/main/java/org/opennms/netmgt/vacuumd/Transaction.java M opennms-test/src/main/java/org/opennms/test/DaoTestConfigBean.java M opennms-tools/ireport-resource-query-provider/pom.xml M opennms-util/src/main/java/org/opennms/core/resource/db/SimpleDbConnectionFactory.java M opennms-web-api/src/main/java/org/opennms/web/servlet/ServletInitializer.java M opennms-webapp/src/main/java/org/opennms/web/admin/users/parsers/DutySchedule.java M opennms-webapp/src/main/java/org/opennms/web/report/database/DeliveryOptionsValidator.java M opennms-webapp/src/main/java/org/opennms/web/rest/ISO8601DateEditor.java M opennms-webapp/src/main/webapp/element/node.jsp M opennms-webapp/src/main/webapp/includes/eventlist.jsp M pom.xml M protocols/dhcp/src/main/java/org/opennms/netmgt/dhcpd/Message.java M protocols/xmp/pom.xml M protocols/xmp/src/assembly/lib.xml M tools/packages/opennms/opennms.spec Log Message: ----------- Merge branch 'master' of github.com:OpenNMS/opennms Commit: 049b8a5431c29bded7fc9ce7eb8e66f0624c2974 https://github.com/OpenNMS/opennms/commit/049b8a5431c29bded7fc9ce7eb8e66f0624c2974 Author: Benjamin Reed &lt;ranger&lt; at &gt;opennms.org&gt; Date: 2013-05-15 (Wed, 15 May 2013) Changed paths: M opennms-webapp/src/main/webapp/WEB-INF/jsp/alarm/list.jsp Log Message: ----------- Merge remote-tracking branch 'origin/1.10' into 1.12 Commit: 61262e588ee1b779e248582256c2f2ba941a0b62 https://github.com/OpenNMS/opennms/commit/61262e588ee1b779e248582256c2f2ba941a0b62 Author: Benjamin Reed &lt;ranger&lt; at &gt;opennms.org&gt; Date: 2013-05-15 (Wed, 15 May 2013) Changed paths: M opennms-rrd/opennms-rrd-jrobin/src/main/java/org/opennms/netmgt/rrd/jrobin/JRobinRrdStrategy.java M opennms-webapp/src/main/webapp/WEB-INF/jsp/alarm/list.jsp M opennms-webapp/src/main/webapp/WEB-INF/jsp/element/service.jsp M opennms-webapp/src/main/webapp/element/interface.jsp Log Message: ----------- Merge branch '1.12' Commit: 87c469b6047bddb2cde1501b64275bd99f2f8ca3 https://github.com/OpenNMS/opennms/commit/87c469b6047bddb2cde1501b64275bd99f2f8ca3 Author: Markus von Rüden &lt;mvr&lt; at &gt;opennms.com&gt; Date: 2013-05-15 (Wed, 15 May 2013) Changed paths: M features/topology-map/org.opennms.features.topology.app/src/main/java/org/opennms/features/topology/app/internal/operations/AddVertexToGroupOperation.java M features/topology-map/org.opennms.features.topology.app/src/main/java/org/opennms/features/topology/app/internal/operations/CreateGroupOperation.java A features/topology-map/org.opennms.features.topology.app/src/main/java/org/opennms/features/topology/app/internal/operations/GroupWindow.java M features/topology-map/org.opennms.features.topology.app/src/test/java/org/opennms/features/topology/app/internal/operations/GroupOperationsTest.java Log Message: ----------- Small Improvements in creating groups and adding items to groups in topology map. Also fixed issue #SPC-601 Commit: 06e578dba3a646d36703f0c34a0bbcdc8c298e7b https://github.com/OpenNMS/opennms/commit/06e578dba3a646d36703f0c34a0bbcdc8c298e7b Author: Alejandro Galue &lt;agalue&lt; at &gt;opennms.org&gt; Date: 2013-05-16 (Thu, 16 May 2013) Changed paths: M opennms-webapp/src/main/webapp/element/service.jsp Log Message: ----------- Fix for enhancement NMS-5876 - Part II IMPORTANT: DO NOT MERGE THIS ON 1.12 New features: - Hide password fields (for security reasons) - Display the Monitor Class - Display complex XML parameters like PSM or MTM. Commit: 2db49574f5b0d7159fefaa7ad3e06f604b12f451 https://github.com/OpenNMS/opennms/commit/2db49574f5b0d7159fefaa7ad3e06f604b12f451 Author: Alejandro Galue &lt;agalue&lt; at &gt;opennms.org&gt; Date: 2013-05-16 (Thu, 16 May 2013) Changed paths: M opennms-webapp/src/main/webapp/WEB-INF/jsp/element/service.jsp Log Message: ----------- Fix for enhancement NMS-5876 - Part II New features: - Hide password fields (for security reasons) - Display the Monitor Class - Display complex XML parameters like PSM or MTM. Commit: a59e27f935aad70a7d9687a6eb7cbae0abb281bc https://github.com/OpenNMS/opennms/commit/a59e27f935aad70a7d9687a6eb7cbae0abb281bc Author: Markus von Rüden &lt;mvr&lt; at &gt;opennms.com&gt; Date: 2013-05-16 (Thu, 16 May 2013) Changed paths: M features/topology-map/plugins/org.opennms.features.topology.plugins.browsers/src/main/java/org/opennms/features/topology/plugins/browsers/AlarmTable.java M features/topology-map/plugins/org.opennms.features.topology.plugins.browsers/src/main/java/org/opennms/features/topology/plugins/browsers/SelectionAwareTable.java M features/topology-map/plugins/org.opennms.features.topology.plugins.browsers/src/main/resources/OSGI-INF/blueprint/blueprint.xml M features/topology-map/plugins/org.opennms.features.topology.plugins.topo.simple/src/test/java/org/opennms/features/topology/plugins/topo/simple/SimpleGraphProviderTest.java M features/topology-map/plugins/org.opennms.features.topology.plugins.topo.vmware/src/main/java/org/opennms/features/topology/plugins/topo/vmware/internal/VmwareTopologyProvider.java Log Message: ----------- Fix of #SPC-602 Commit: 1f3301f6add12b10b9869b3f4edaf4c668c39823 https://github.com/OpenNMS/opennms/commit/1f3301f6add12b10b9869b3f4edaf4c668c39823 Author: Seth Leger &lt;seth&lt; at &gt;opennms.org&gt; Date: 2013-05-16 (Thu, 16 May 2013) Changed paths: M opennms-webapp/src/main/java/org/opennms/web/svclayer/support/DefaultNodeListService.java M opennms-webapp/src/main/java/org/opennms/web/svclayer/support/DefaultRtcService.java Log Message: ----------- Changed classes to use more appropriate constants from OnmsCriteria. Commit: dcc839d2b95e6c1949e83cd94313dd13111ace1d https://github.com/OpenNMS/opennms/commit/dcc839d2b95e6c1949e83cd94313dd13111ace1d Author: Seth Leger &lt;seth&lt; at &gt;opennms.org&gt; Date: 2013-05-16 (Thu, 16 May 2013) Changed paths: M features/topology-map/plugins/org.opennms.features.topology.plugins.browsers/src/main/java/org/opennms/features/topology/plugins/browsers/SelectionAwareTable.java M opennms-import/src/main/java/org/opennms/netmgt/importer/operations/AbstractSaveOrUpdateOperation.java M opennms-provision/opennms-provisiond/src/main/java/org/opennms/netmgt/provision/service/Provisioner.java Log Message: ----------- Got rid of unnecessary casts, warning cleanup. Commit: 81a7ebad2b70d1d652f9e15ec03c9d12fb296492 https://github.com/OpenNMS/opennms/commit/81a7ebad2b70d1d652f9e15ec03c9d12fb296492 Author: Benjamin Reed &lt;ranger&lt; at &gt;opennms.org&gt; Date: 2013-05-16 (Thu, 16 May 2013) Changed paths: M features/themes/onms-default-theme/src/main/java/VAADIN/themes/opennms/styles.css M opennms-webapp/src/main/java/org/opennms/web/controller/NavBarController.java A opennms-webapp/src/main/java/org/opennms/web/navigate/MenuDropdownNavBarEntry.java M opennms-webapp/src/main/webapp/WEB-INF/dispatcher-servlet.xml M opennms-webapp/src/main/webapp/css/styles.css Log Message: ----------- put map links into a submenu; also, implement submenus Commit: b48ef4bdf2cfca69ac6b3b01ed042f6262286c60 https://github.com/OpenNMS/opennms/commit/b48ef4bdf2cfca69ac6b3b01ed042f6262286c60 Author: Benjamin Reed &lt;ranger&lt; at &gt;opennms.org&gt; Date: 2013-05-16 (Thu, 16 May 2013) Log Message: ----------- Merge remote-tracking branch 'origin/1.10' into 1.12 Conflicts: opennms-webapp/src/main/webapp/WEB-INF/jsp/element/service.jsp Commit: 316c698e590e6584ebeeb653b854e9cee18b6779 https://github.com/OpenNMS/opennms/commit/316c698e590e6584ebeeb653b854e9cee18b6779 Author: Benjamin Reed &lt;ranger&lt; at &gt;opennms.org&gt; Date: 2013-05-16 (Thu, 16 May 2013) Changed paths: M features/themes/onms-default-theme/src/main/java/VAADIN/themes/opennms/styles.css M opennms-webapp/src/main/java/org/opennms/web/controller/NavBarController.java A opennms-webapp/src/main/java/org/opennms/web/navigate/MenuDropdownNavBarEntry.java M opennms-webapp/src/main/webapp/WEB-INF/dispatcher-servlet.xml M opennms-webapp/src/main/webapp/WEB-INF/jsp/element/service.jsp M opennms-webapp/src/main/webapp/css/styles.css Log Message: ----------- Merge branch '1.12' Commit: c4b513486f7c2f9e06565f2bc7dae5f814640421 https://github.com/OpenNMS/opennms/commit/c4b513486f7c2f9e06565f2bc7dae5f814640421 Author: Benjamin Reed &lt;ranger&lt; at &gt;opennms.org&gt; Date: 2013-05-16 (Thu, 16 May 2013) Changed paths: A opennms-webapp/src/main/java/org/opennms/web/controller/MapsController.java M opennms-webapp/src/main/java/org/opennms/web/navigate/MenuDropdownNavBarEntry.java M opennms-webapp/src/main/webapp/WEB-INF/dispatcher-servlet.xml A opennms-webapp/src/main/webapp/WEB-INF/jsp/maps.jsp Log Message: ----------- create a map link so maps can be reached on a touch interface Commit: 0b66f0821e73874c938d022a716edee53ff83bed https://github.com/OpenNMS/opennms/commit/0b66f0821e73874c938d022a716edee53ff83bed Author: Benjamin Reed &lt;ranger&lt; at &gt;opennms.org&gt; Date: 2013-05-16 (Thu, 16 May 2013) Changed paths: A opennms-webapp/src/main/java/org/opennms/web/controller/MapsController.java M opennms-webapp/src/main/java/org/opennms/web/navigate/MenuDropdownNavBarEntry.java M opennms-webapp/src/main/webapp/WEB-INF/dispatcher-servlet.xml A opennms-webapp/src/main/webapp/WEB-INF/jsp/maps.jsp Log Message: ----------- Merge branch '1.12' Commit: 1d6601a62dbe3cdb66372bf93b6295fd309080f1 https://github.com/OpenNMS/opennms/commit/1d6601a62dbe3cdb66372bf93b6295fd309080f1 Author: Benjamin Reed &lt;ranger&lt; at &gt;opennms.org&gt; Date: 2013-05-16 (Thu, 16 May 2013) Changed paths: M smoke-test/src/test/java/org/opennms/smoketest/DistributedMapTest.java M smoke-test/src/test/java/org/opennms/smoketest/MapPageTest.java M smoke-test/src/test/java/org/opennms/smoketest/ServicePageTest.java Log Message: ----------- fix smoke tests for new maps links Commit: ddb36c1de121f9eb7a68bd6c114a61af938cca39 https://github.com/OpenNMS/opennms/commit/ddb36c1de121f9eb7a68bd6c114a61af938cca39 Author: Benjamin Reed &lt;ranger&lt; at &gt;opennms.org&gt; Date: 2013-05-16 (Thu, 16 May 2013) Changed paths: M smoke-test/src/test/java/org/opennms/smoketest/DistributedMapTest.java M smoke-test/src/test/java/org/opennms/smoketest/MapPageTest.java M smoke-test/src/test/java/org/opennms/smoketest/ServicePageTest.java Log Message: ----------- Merge branch '1.12' Commit: 3269d916ed3819cfcb160f83c98e6c940af0e500 https://github.com/OpenNMS/opennms/commit/3269d916ed3819cfcb160f83c98e6c940af0e500 Author: Donald Desloge &lt;desloge&lt; at &gt;opennms.com&gt; Date: 2013-05-17 (Fri, 17 May 2013) Changed paths: M features/topology-map/plugins/org.opennms.features.topology.plugins.ncs/pom.xml A features/topology-map/plugins/org.opennms.features.topology.plugins.ncs/src/main/java/org/opennms/features/topology/plugins/ncs/internal/CustomHttpClientConfigurer.java M features/topology-map/plugins/org.opennms.features.topology.plugins.ncs/src/main/resources/OSGI-INF/blueprint/blueprint.xml Log Message: ----------- Add https support for NCS Path provider Commit: d9168334a42182c5128e3b8e3b2eb48bb882caef https://github.com/OpenNMS/opennms/commit/d9168334a42182c5128e3b8e3b2eb48bb882caef Author: Eric Evans &lt;eevans&lt; at &gt;sym-link.com&gt; Date: 2013-05-18 (Sat, 18 May 2013) Changed paths: M opennms-base-assembly/src/main/filtered/bin/opennms Log Message: ----------- don't init additional opts; allow setting in env Commit: 8cef2bc302053baadda035ebc34ad6c681cb4eab https://github.com/OpenNMS/opennms/commit/8cef2bc302053baadda035ebc34ad6c681cb4eab Author: Eric Evans &lt;eevans&lt; at &gt;sym-link.com&gt; Date: 2013-05-24 (Fri, 24 May 2013) Changed paths: M core/snmp/joesnmp/src/main/java/org/opennms/protocols/snmp/SnmpCounter64.java M core/snmp/joesnmp/src/main/java/org/opennms/protocols/snmp/SnmpSession.java M core/snmp/joesnmp/src/main/java/org/opennms/protocols/snmp/SnmpTrapSession.java M features/acl/src/main/java/org/opennms/acl/ui/UserController.java M features/ncs/ncs-northbounder/src/main/java/org/opennms/netmgt/ncs/northbounder/NCSNorthbounderManager.java M features/remote-poller-gwt/src/main/java/org/opennms/features/poller/remote/gwt/client/OpenLayersMapPanel.java M features/reporting/availability/src/main/java/org/opennms/reporting/availability/AvailabilityData.java M features/themes/onms-default-theme/src/main/java/VAADIN/themes/opennms/styles.css M features/topology-map/org.opennms.features.topology.api/src/main/java/org/opennms/features/topology/api/topo/AbstractTopologyProvider.java M features/topology-map/org.opennms.features.topology.app/src/main/java/org/opennms/features/topology/app/internal/operations/AddVertexToGroupOperation.java M features/topology-map/org.opennms.features.topology.app/src/main/java/org/opennms/features/topology/app/internal/operations/CreateGroupOperation.java A features/topology-map/org.opennms.features.topology.app/src/main/java/org/opennms/features/topology/app/internal/operations/GroupWindow.java M features/topology-map/org.opennms.features.topology.app/src/test/java/org/opennms/features/topology/app/internal/operations/GroupOperationsTest.java M features/topology-map/plugins/org.opennms.features.topology.plugins.browsers/src/main/java/org/opennms/features/topology/plugins/browsers/AlarmTable.java M features/topology-map/plugins/org.opennms.features.topology.plugins.browsers/src/main/java/org/opennms/features/topology/plugins/browsers/SelectionAwareTable.java M features/topology-map/plugins/org.opennms.features.topology.plugins.browsers/src/main/resources/OSGI-INF/blueprint/blueprint.xml M features/topology-map/plugins/org.opennms.features.topology.plugins.ncs/pom.xml A features/topology-map/plugins/org.opennms.features.topology.plugins.ncs/src/main/java/org/opennms/features/topology/plugins/ncs/internal/CustomHttpClientConfigurer.java M features/topology-map/plugins/org.opennms.features.topology.plugins.ncs/src/main/resources/OSGI-INF/blueprint/blueprint.xml M features/topology-map/plugins/org.opennms.features.topology.plugins.topo.linkd/src/test/java/org/opennms/features/topology/plugins/topo/linkd/internal/LinkdTopologyProviderTest.java M features/topology-map/plugins/org.opennms.features.topology.plugins.topo.simple/src/test/java/org/opennms/features/topology/plugins/topo/simple/SimpleGraphProviderTest.java M features/topology-map/plugins/org.opennms.features.topology.plugins.topo.vmware/src/main/java/org/opennms/features/topology/plugins/topo/vmware/internal/VmwareTopologyProvider.java M integrations/opennms-link-provisioning-adapter/src/main/java/org/opennms/netmgt/provision/adapters/link/DefaultNodeLinkService.java M opennms-config-model/src/main/java/org/opennms/netmgt/eventd/datablock/EventKey.java M opennms-config/src/main/java/org/opennms/netmgt/config/BasicScheduleUtils.java M opennms-config/src/main/java/org/opennms/netmgt/config/MibObject.java M opennms-config/src/main/java/org/opennms/netmgt/config/WebSchedEntry.java M opennms-import/src/main/java/org/opennms/netmgt/importer/operations/AbstractSaveOrUpdateOperation.java M opennms-model/src/main/java/org/opennms/netmgt/model/discovery/IPPollAddress.java M opennms-provision/opennms-provisiond/src/main/java/org/opennms/netmgt/provision/service/Provisioner.java M opennms-qosdaemon/src/main/java/org/openoss/opennms/spring/qosd/ejb/AlarmListJ2eeConnectionManagerThread.java M opennms-rrd/opennms-rrd-jrobin/src/main/java/org/opennms/netmgt/rrd/jrobin/JRobinRrdStrategy.java M opennms-services/src/main/java/org/opennms/netmgt/capsd/SmbUtils.java M opennms-services/src/main/java/org/opennms/netmgt/linkd/DiscoveryLink.java M opennms-services/src/main/java/org/opennms/netmgt/linkd/SnmpCollection.java M opennms-services/src/main/java/org/opennms/netmgt/linkd/scheduler/ReadyRunnable.java M opennms-services/src/main/java/org/opennms/netmgt/linkd/scheduler/Scheduler.java M opennms-services/src/main/java/org/opennms/netmgt/poller/remote/support/DefaultPollerBackEnd.java M opennms-services/src/main/java/org/opennms/netmgt/vacuumd/Transaction.java M opennms-test/src/main/java/org/opennms/test/DaoTestConfigBean.java M opennms-util/src/main/java/org/opennms/core/resource/db/SimpleDbConnectionFactory.java M opennms-web-api/src/main/java/org/opennms/web/servlet/ServletInitializer.java M opennms-webapp/src/main/java/org/opennms/web/admin/users/parsers/DutySchedule.java A opennms-webapp/src/main/java/org/opennms/web/controller/MapsController.java M opennms-webapp/src/main/java/org/opennms/web/controller/NavBarController.java A opennms-webapp/src/main/java/org/opennms/web/navigate/MenuDropdownNavBarEntry.java M opennms-webapp/src/main/java/org/opennms/web/report/database/DeliveryOptionsValidator.java M opennms-webapp/src/main/java/org/opennms/web/rest/ISO8601DateEditor.java M opennms-webapp/src/main/java/org/opennms/web/rest/OnmsRestService.java M opennms-webapp/src/main/java/org/opennms/web/svclayer/support/DefaultNodeListService.java M opennms-webapp/src/main/java/org/opennms/web/svclayer/support/DefaultRtcService.java M opennms-webapp/src/main/webapp/WEB-INF/dispatcher-servlet.xml M opennms-webapp/src/main/webapp/WEB-INF/jsp/alarm/list.jsp M opennms-webapp/src/main/webapp/WEB-INF/jsp/element/service.jsp A opennms-webapp/src/main/webapp/WEB-INF/jsp/maps.jsp M opennms-webapp/src/main/webapp/css/styles.css M opennms-webapp/src/main/webapp/element/interface.jsp M protocols/dhcp/src/main/java/org/opennms/netmgt/dhcpd/Message.java M smoke-test/src/test/java/org/opennms/smoketest/DistributedMapTest.java M smoke-test/src/test/java/org/opennms/smoketest/MapPageTest.java M smoke-test/src/test/java/org/opennms/smoketest/ServicePageTest.java Log Message: ----------- Merge branch 'master' into smnnepo Compare: https://github.com/OpenNMS/opennms/compare/40c6f3975827...8cef2bc30205 ------------------------------------------------------------------------------ Try New Relic Now &amp; We'll Send You this Cool Shirt New Relic is the only SaaS-based application performance monitoring service that delivers powerful full stack analytics. Optimize and monitor your browser, app, &amp; servers with just a few lines of code. Try New Relic and get this awesome Nerd Life shirt! http://p.sf.net/sfu/newrelic_d2d_may_______________________________________________ Please read the OpenNMS Mailing List FAQ: http://www.opennms.org/wiki/index.php?page=MailingListFaq opennms-cvs mailing list To *unsubscribe* or change your subscription options, see the bottom of this page: https://lists.sourceforge.net/lists/listinfo/opennms-cvs</pre> Eric Evans 2013-05-24T14:32:54 [OpenNMS/opennms] 419184: remove logging implementation from hibernate depen... http://permalink.gmane.org/gmane.network.opennms.cvs/29404 <pre> Branch: refs/heads/smnnepo Home: https://github.com/OpenNMS/opennms Commit: 419184aec0d18d4c3d100af8a031aad25dd66051 https://github.com/OpenNMS/opennms/commit/419184aec0d18d4c3d100af8a031aad25dd66051 Author: Matt Brozowski &lt;brozow&lt; at &gt;opennms.org&gt; Date: 2013-05-23 (Thu, 23 May 2013) Changed paths: M dependencies/hibernate/pom.xml Log Message: ----------- remove logging implementation from hibernate dependencies pom Commit: ceb54a35e12235b61b0e9e51dc460d6d0d215e10 https://github.com/OpenNMS/opennms/commit/ceb54a35e12235b61b0e9e51dc460d6d0d215e10 Author: Matt Brozowski &lt;brozow&lt; at &gt;opennms.org&gt; Date: 2013-05-23 (Thu, 23 May 2013) Changed paths: A features/smnnepo/sample-test/pom.xml A features/smnnepo/sample-test/src/main/resources/META-INF/opennms/applicationContext-datasource.xml A features/smnnepo/sample-test/src/main/resources/META-INF/opennms/applicationContext-testDao.xml A features/smnnepo/sample-test/src/main/resources/beanRefContext.xml Log Message: ----------- create a test module that can be used to setup a test environment Commit: 40c6f3975827b7b9be445608f464bf290618d717 https://github.com/OpenNMS/opennms/commit/40c6f3975827b7b9be445608f464bf290618d717 Author: Matt Brozowski &lt;brozow&lt; at &gt;opennms.org&gt; Date: 2013-05-23 (Thu, 23 May 2013) Changed paths: M features/smnnepo/pom.xml A features/smnnepo/sampler-config/pom.xml A features/smnnepo/sampler-config/src/main/java/org/opennms/netmgt/sampler/config/SamplerConfiguration.java A features/smnnepo/sampler-config/src/main/java/org/opennms/netmgt/sampler/config/SamplerConfigurationProvider.java A features/smnnepo/sampler-config/src/main/java/org/opennms/netmgt/sampler/config/internal/DefaultSamplerConfigurationProvider.java A features/smnnepo/sampler-config/src/test/java/org/opennms/netmgt/sampler/config/internal/DefaultSampleConfigurationProviderTest.java A features/smnnepo/sampler-config/src/test/resources/DefaultSampleConfigurationProviderTest-context.xml A features/smnnepo/sampler-config/src/test/resources/monitoring-locations.xml Log Message: ----------- create the beginnings of a sampler-config module for exporting a sampler configruation to a remote system Compare: https://github.com/OpenNMS/opennms/compare/92654139e3c4...40c6f3975827 ------------------------------------------------------------------------------ Try New Relic Now &amp; We'll Send You this Cool Shirt New Relic is the only SaaS-based application performance monitoring service that delivers powerful full stack analytics. Optimize and monitor your browser, app, &amp; servers with just a few lines of code. Try New Relic and get this awesome Nerd Life shirt! http://p.sf.net/sfu/newrelic_d2d_may_______________________________________________ Please read the OpenNMS Mailing List FAQ: http://www.opennms.org/wiki/index.php?page=MailingListFaq opennms-cvs mailing list To *unsubscribe* or change your subscription options, see the bottom of this page: https://lists.sourceforge.net/lists/listinfo/opennms-cvs</pre> Matt Brozowski 2013-05-24T01:14:13 [OpenNMS/opennms] http://permalink.gmane.org/gmane.network.opennms.cvs/29403 <pre> Branch: refs/heads/realthargor/NMS-5874 Home: https://github.com/OpenNMS/opennms ------------------------------------------------------------------------------ Try New Relic Now &amp; We'll Send You this Cool Shirt New Relic is the only SaaS-based application performance monitoring service that delivers powerful full stack analytics. Optimize and monitor your browser, app, &amp; servers with just a few lines of code. Try New Relic and get this awesome Nerd Life shirt! http://p.sf.net/sfu/newrelic_d2d_may_______________________________________________ Please read the OpenNMS Mailing List FAQ: http://www.opennms.org/wiki/index.php?page=MailingListFaq opennms-cvs mailing list To *unsubscribe* or change your subscription options, see the bottom of this page: https://lists.sourceforge.net/lists/listinfo/opennms-cvs</pre> realthargor 2013-05-23T23:02:56 [OpenNMS/opennms] 92d3e0: Fix of #SPC-480 http://permalink.gmane.org/gmane.network.opennms.cvs/29402 <pre> Branch: refs/heads/master Home: https://github.com/OpenNMS/opennms Commit: 92d3e0eee6cdb7527ff32cffced5cb6f2cb9d644 https://github.com/OpenNMS/opennms/commit/92d3e0eee6cdb7527ff32cffced5cb6f2cb9d644 Author: Markus von Rüden &lt;mvr&lt; at &gt;opennms.com&gt; Date: 2013-05-23 (Thu, 23 May 2013) Changed paths: M opennms-webapp/src/main/java/org/opennms/web/rest/OnmsRestService.java Log Message: ----------- Fix of #SPC-480 Commit: 08098bbb71b96681c095bacdc39141d20b14e02e https://github.com/OpenNMS/opennms/commit/08098bbb71b96681c095bacdc39141d20b14e02e Author: Benjamin Reed &lt;ranger&lt; at &gt;opennms.org&gt; Date: 2013-05-23 (Thu, 23 May 2013) Changed paths: M opennms-base-assembly/src/main/filtered/bin/opennms Log Message: ----------- allow overriding opennms.conf with a user-specific file Commit: db316cc77fac3e97045f710fe69928207b92d2aa https://github.com/OpenNMS/opennms/commit/db316cc77fac3e97045f710fe69928207b92d2aa Author: Benjamin Reed &lt;ranger&lt; at &gt;opennms.org&gt; Date: 2013-05-23 (Thu, 23 May 2013) Changed paths: M opennms-base-assembly/src/main/filtered/bin/opennms Log Message: ----------- Merge branch '1.12' Compare: https://github.com/OpenNMS/opennms/compare/946a7c6d74de...db316cc77fac ------------------------------------------------------------------------------ Try New Relic Now &amp; We'll Send You this Cool Shirt New Relic is the only SaaS-based application performance monitoring service that delivers powerful full stack analytics. Optimize and monitor your browser, app, &amp; servers with just a few lines of code. Try New Relic and get this awesome Nerd Life shirt! http://p.sf.net/sfu/newrelic_d2d_may_______________________________________________ Please read the OpenNMS Mailing List FAQ: http://www.opennms.org/wiki/index.php?page=MailingListFaq opennms-cvs mailing list To *unsubscribe* or change your subscription options, see the bottom of this page: https://lists.sourceforge.net/lists/listinfo/opennms-cvs</pre> Benjamin Reed 2013-05-23T20:26:44 [OpenNMS/opennms] 08098b: allow overriding opennms.conf with a user-specific... http://permalink.gmane.org/gmane.network.opennms.cvs/29401 <pre> Branch: refs/heads/1.12 Home: https://github.com/OpenNMS/opennms Commit: 08098bbb71b96681c095bacdc39141d20b14e02e https://github.com/OpenNMS/opennms/commit/08098bbb71b96681c095bacdc39141d20b14e02e Author: Benjamin Reed &lt;ranger&lt; at &gt;opennms.org&gt; Date: 2013-05-23 (Thu, 23 May 2013) Changed paths: M opennms-base-assembly/src/main/filtered/bin/opennms Log Message: ----------- allow overriding opennms.conf with a user-specific file ------------------------------------------------------------------------------ Try New Relic Now &amp; We'll Send You this Cool Shirt New Relic is the only SaaS-based application performance monitoring service that delivers powerful full stack analytics. Optimize and monitor your browser, app, &amp; servers with just a few lines of code. Try New Relic and get this awesome Nerd Life shirt! http://p.sf.net/sfu/newrelic_d2d_may_______________________________________________ Please read the OpenNMS Mailing List FAQ: http://www.opennms.org/wiki/index.php?page=MailingListFaq opennms-cvs mailing list To *unsubscribe* or change your subscription options, see the bottom of this page: https://lists.sourceforge.net/lists/listinfo/opennms-cvs</pre> Benjamin Reed 2013-05-23T20:26:21 [OpenNMS/opennms] 946a7c: Reversed the sorting of nulls and the asc/desc ind... http://permalink.gmane.org/gmane.network.opennms.cvs/29400 <pre> Branch: refs/heads/master Home: https://github.com/OpenNMS/opennms Commit: 946a7c6d74de954a78535575beb9ae67c610c806 https://github.com/OpenNMS/opennms/commit/946a7c6d74de954a78535575beb9ae67c610c806 Author: Seth Leger &lt;seth&lt; at &gt;opennms.org&gt; Date: 2013-05-23 (Thu, 23 May 2013) Changed paths: M features/topology-map/plugins/org.opennms.features.topology.plugins.browsers/src/main/java/org/opennms/features/topology/plugins/browsers/NodeTable.java Log Message: ----------- Reversed the sorting of nulls and the asc/desc indicator to make primaryInterface match the other string fields in a Container. ------------------------------------------------------------------------------ Try New Relic Now &amp; We'll Send You this Cool Shirt New Relic is the only SaaS-based application performance monitoring service that delivers powerful full stack analytics. Optimize and monitor your browser, app, &amp; servers with just a few lines of code. Try New Relic and get this awesome Nerd Life shirt! http://p.sf.net/sfu/newrelic_d2d_may_______________________________________________ Please read the OpenNMS Mailing List FAQ: http://www.opennms.org/wiki/index.php?page=MailingListFaq opennms-cvs mailing list To *unsubscribe* or change your subscription options, see the bottom of this page: https://lists.sourceforge.net/lists/listinfo/opennms-cvs</pre> Seth Leger 2013-05-23T19:04:40 [OpenNMS/opennms] ce754b: Updated NodeDaoContainer so that it doesn't set th... http://permalink.gmane.org/gmane.network.opennms.cvs/29399 <pre> Branch: refs/heads/master Home: https://github.com/OpenNMS/opennms Commit: ce754b82f8387317af67418d305a7d15fc962fdc https://github.com/OpenNMS/opennms/commit/ce754b82f8387317af67418d305a7d15fc962fdc Author: Seth Leger &lt;seth&lt; at &gt;opennms.org&gt; Date: 2013-05-23 (Thu, 23 May 2013) Changed paths: M features/topology-map/plugins/org.opennms.features.topology.plugins.browsers/src/main/java/org/opennms/features/topology/plugins/browsers/NodeDaoContainer.java M features/topology-map/plugins/org.opennms.features.topology.plugins.browsers/src/main/java/org/opennms/features/topology/plugins/browsers/NodeTable.java Log Message: ----------- Updated NodeDaoContainer so that it doesn't set the primaryInterface column as non-sortable so that it still applies the sorting CSS styles when our HeaderClickListener changes the sorting. Fixes bug SPC-579. ------------------------------------------------------------------------------ Try New Relic Now &amp; We'll Send You this Cool Shirt New Relic is the only SaaS-based application performance monitoring service that delivers powerful full stack analytics. Optimize and monitor your browser, app, &amp; servers with just a few lines of code. Try New Relic and get this awesome Nerd Life shirt! http://p.sf.net/sfu/newrelic_d2d_may_______________________________________________ Please read the OpenNMS Mailing List FAQ: http://www.opennms.org/wiki/index.php?page=MailingListFaq opennms-cvs mailing list To *unsubscribe* or change your subscription options, see the bottom of this page: https://lists.sourceforge.net/lists/listinfo/opennms-cvs</pre> Seth Leger 2013-05-23T18:50:20 [OpenNMS/opennms] 35c293: update how we calculate the link status for edges ... http://permalink.gmane.org/gmane.network.opennms.cvs/29398 <pre> Branch: refs/heads/master Home: https://github.com/OpenNMS/opennms Commit: 35c293011769000c91c857da288531d939ed9447 https://github.com/OpenNMS/opennms/commit/35c293011769000c91c857da288531d939ed9447 Author: Donald Desloge &lt;desloge&lt; at &gt;opennms.com&gt; Date: 2013-05-23 (Thu, 23 May 2013) Changed paths: M features/topology-map/plugins/org.opennms.features.topology.plugins.topo.linkd/src/main/java/org/opennms/features/topology/plugins/topo/linkd/internal/LinkdTopologyProvider.java Log Message: ----------- update how we calculate the link status for edges in linkd topo provider ------------------------------------------------------------------------------ Try New Relic Now &amp; We'll Send You this Cool Shirt New Relic is the only SaaS-based application performance monitoring service that delivers powerful full stack analytics. Optimize and monitor your browser, app, &amp; servers with just a few lines of code. Try New Relic and get this awesome Nerd Life shirt! http://p.sf.net/sfu/newrelic_d2d_may_______________________________________________ Please read the OpenNMS Mailing List FAQ: http://www.opennms.org/wiki/index.php?page=MailingListFaq opennms-cvs mailing list To *unsubscribe* or change your subscription options, see the bottom of this page: https://lists.sourceforge.net/lists/listinfo/opennms-cvs</pre> Donald Desloge 2013-05-23T16:46:35 [OpenNMS/opennms] 478a7e: Added some calls to internal com.vaadin.ui.Table f... http://permalink.gmane.org/gmane.network.opennms.cvs/29397 <pre> Branch: refs/heads/master Home: https://github.com/OpenNMS/opennms Commit: 478a7e5dc901bb79ad12fe06fc66d18dd7f21bf4 https://github.com/OpenNMS/opennms/commit/478a7e5dc901bb79ad12fe06fc66d18dd7f21bf4 Author: Seth Leger &lt;seth&lt; at &gt;opennms.org&gt; Date: 2013-05-23 (Thu, 23 May 2013) Changed paths: M features/topology-map/plugins/org.opennms.features.topology.plugins.browsers/src/main/java/org/opennms/features/topology/plugins/browsers/NodeTable.java Log Message: ----------- Added some calls to internal com.vaadin.ui.Table functions so that the sort column indicators are refreshed when sorting on the primaryInterface column. Unfortunately, this doesn't style the primaryInterface column but it does reset the styles on the other columns. ------------------------------------------------------------------------------ Try New Relic Now &amp; We'll Send You this Cool Shirt New Relic is the only SaaS-based application performance monitoring service that delivers powerful full stack analytics. Optimize and monitor your browser, app, &amp; servers with just a few lines of code. Try New Relic and get this awesome Nerd Life shirt! http://p.sf.net/sfu/newrelic_d2d_may_______________________________________________ Please read the OpenNMS Mailing List FAQ: http://www.opennms.org/wiki/index.php?page=MailingListFaq opennms-cvs mailing list To *unsubscribe* or change your subscription options, see the bottom of this page: https://lists.sourceforge.net/lists/listinfo/opennms-cvs</pre> Seth Leger 2013-05-23T16:41:22 [OpenNMS/opennms] e45ca7: Added a comparator to the getPrimaryInterface() me... http://permalink.gmane.org/gmane.network.opennms.cvs/29396 <pre> Branch: refs/heads/master Home: https://github.com/OpenNMS/opennms Commit: e45ca73313af27113727444dd74b912da1a1b1b7 https://github.com/OpenNMS/opennms/commit/e45ca73313af27113727444dd74b912da1a1b1b7 Author: Seth Leger &lt;seth&lt; at &gt;opennms.org&gt; Date: 2013-05-23 (Thu, 23 May 2013) Changed paths: M opennms-dao/src/main/java/org/opennms/netmgt/dao/hibernate/IpInterfaceDaoHibernate.java M opennms-model/src/main/java/org/opennms/netmgt/model/OnmsNode.java Log Message: ----------- Added a comparator to the getPrimaryInterface() method of OnmsNode so that the most recently scanned interface is always returned. Commit: df3f73368207c2608acca75f42f6b87d487df63b https://github.com/OpenNMS/opennms/commit/df3f73368207c2608acca75f42f6b87d487df63b Author: Seth Leger &lt;seth&lt; at &gt;opennms.org&gt; Date: 2013-05-23 (Thu, 23 May 2013) Changed paths: M features/topology-map/plugins/org.opennms.features.topology.plugins.browsers/src/main/java/org/opennms/features/topology/plugins/browsers/NodeTable.java Log Message: ----------- Added reversible sorting to the primaryInterface sorting in NodeTable. Compare: https://github.com/OpenNMS/opennms/compare/44bf5f46b754...df3f73368207 ------------------------------------------------------------------------------ Try New Relic Now &amp; We'll Send You this Cool Shirt New Relic is the only SaaS-based application performance monitoring service that delivers powerful full stack analytics. Optimize and monitor your browser, app, &amp; servers with just a few lines of code. Try New Relic and get this awesome Nerd Life shirt! http://p.sf.net/sfu/newrelic_d2d_may_______________________________________________ Please read the OpenNMS Mailing List FAQ: http://www.opennms.org/wiki/index.php?page=MailingListFaq opennms-cvs mailing list To *unsubscribe* or change your subscription options, see the bottom of this page: https://lists.sourceforge.net/lists/listinfo/opennms-cvs</pre> Seth Leger 2013-05-23T15:45:28 [OpenNMS/opennms] 92d3e0: Fix of #SPC-480 http://permalink.gmane.org/gmane.network.opennms.cvs/29395 <pre> Branch: refs/heads/1.12 Home: https://github.com/OpenNMS/opennms Commit: 92d3e0eee6cdb7527ff32cffced5cb6f2cb9d644 https://github.com/OpenNMS/opennms/commit/92d3e0eee6cdb7527ff32cffced5cb6f2cb9d644 Author: Markus von Rüden &lt;mvr&lt; at &gt;opennms.com&gt; Date: 2013-05-23 (Thu, 23 May 2013) Changed paths: M opennms-webapp/src/main/java/org/opennms/web/rest/OnmsRestService.java Log Message: ----------- Fix of #SPC-480 ------------------------------------------------------------------------------ Try New Relic Now &amp; We'll Send You this Cool Shirt New Relic is the only SaaS-based application performance monitoring service that delivers powerful full stack analytics. Optimize and monitor your browser, app, &amp; servers with just a few lines of code. Try New Relic and get this awesome Nerd Life shirt! http://p.sf.net/sfu/newrelic_d2d_may_______________________________________________ Please read the OpenNMS Mailing List FAQ: http://www.opennms.org/wiki/index.php?page=MailingListFaq opennms-cvs mailing list To *unsubscribe* or change your subscription options, see the bottom of this page: https://lists.sourceforge.net/lists/listinfo/opennms-cvs</pre> Markus von Rüden 2013-05-23T15:23:20 [OpenNMS/opennms] 1d6601: fix smoke tests for newmaps links http://permalink.gmane.org/gmane.network.opennms.cvs/29394 <pre> Branch: refs/heads/pull-requests Home: https://github.com/OpenNMS/opennms Commit: 1d6601a62dbe3cdb66372bf93b6295fd309080f1 https://github.com/OpenNMS/opennms/commit/1d6601a62dbe3cdb66372bf93b6295fd309080f1 Author: Benjamin Reed &lt;ranger&lt; at &gt;opennms.org&gt; Date: 2013-05-16 (Thu, 16 May 2013) Changed paths: M smoke-test/src/test/java/org/opennms/smoketest/DistributedMapTest.java M smoke-test/src/test/java/org/opennms/smoketest/MapPageTest.java M smoke-test/src/test/java/org/opennms/smoketest/ServicePageTest.java Log Message: ----------- fix smoke tests for new maps links Commit: ddb36c1de121f9eb7a68bd6c114a61af938cca39 https://github.com/OpenNMS/opennms/commit/ddb36c1de121f9eb7a68bd6c114a61af938cca39 Author: Benjamin Reed &lt;ranger&lt; at &gt;opennms.org&gt; Date: 2013-05-16 (Thu, 16 May 2013) Changed paths: M smoke-test/src/test/java/org/opennms/smoketest/DistributedMapTest.java M smoke-test/src/test/java/org/opennms/smoketest/MapPageTest.java M smoke-test/src/test/java/org/opennms/smoketest/ServicePageTest.java Log Message: ----------- Merge branch '1.12' Commit: 3269d916ed3819cfcb160f83c98e6c940af0e500 https://github.com/OpenNMS/opennms/commit/3269d916ed3819cfcb160f83c98e6c940af0e500 Author: Donald Desloge &lt;desloge&lt; at &gt;opennms.com&gt; Date: 2013-05-17 (Fri, 17 May 2013) Changed paths: M features/topology-map/plugins/org.opennms.features.topology.plugins.ncs/pom.xml A features/topology-map/plugins/org.opennms.features.topology.plugins.ncs/src/main/java/org/opennms/features/topology/plugins/ncs/internal/CustomHttpClientConfigurer.java M features/topology-map/plugins/org.opennms.features.topology.plugins.ncs/src/main/resources/OSGI-INF/blueprint/blueprint.xml Log Message: ----------- Add https support for NCS Path provider Commit: d9168334a42182c5128e3b8e3b2eb48bb882caef https://github.com/OpenNMS/opennms/commit/d9168334a42182c5128e3b8e3b2eb48bb882caef Author: Eric Evans &lt;eevans&lt; at &gt;sym-link.com&gt; Date: 2013-05-18 (Sat, 18 May 2013) Changed paths: M opennms-base-assembly/src/main/filtered/bin/opennms Log Message: ----------- don't init additional opts; allow setting in env Commit: 830e73cae352c75f119dcb4d6fe7d89351adf19a https://github.com/OpenNMS/opennms/commit/830e73cae352c75f119dcb4d6fe7d89351adf19a Author: Benjamin Reed &lt;ranger&lt; at &gt;opennms.org&gt; Date: 2013-05-19 (Sun, 19 May 2013) Changed paths: M dependencies/camel/pom.xml M features/topology-map/plugins/org.opennms.features.topology.plugins.ncs/pom.xml Log Message: ----------- fix camel dependencies Commit: c17b44df5275744cde95c0a63b9707ef2130cfad https://github.com/OpenNMS/opennms/commit/c17b44df5275744cde95c0a63b9707ef2130cfad Author: Markus von Rüden &lt;mvr&lt; at &gt;opennms.com&gt; Date: 2013-05-20 (Mon, 20 May 2013) Changed paths: M features/topology-map/plugins/org.opennms.features.topology.plugins.browsers/src/main/java/org/opennms/features/topology/plugins/browsers/AlarmTable.java M features/topology-map/plugins/org.opennms.features.topology.plugins.browsers/src/main/java/org/opennms/features/topology/plugins/browsers/CheckboxGenerator.java Log Message: ----------- Fix #SPC-599 Commit: c9430261de2ad5b095fb5616065f9107d002435a https://github.com/OpenNMS/opennms/commit/c9430261de2ad5b095fb5616065f9107d002435a Author: Donald Desloge &lt;desloge&lt; at &gt;opennms.com&gt; Date: 2013-05-20 (Mon, 20 May 2013) Changed paths: M features/topology-map/plugins/org.opennms.features.topology.plugins.ncs/src/test/java/org/opennms/features/topology/plugins/ncs/NCSPathProviderTest.java Log Message: ----------- fix ncs test Commit: e59f48fc4c44b3712531cf60e10261cfa2b2d268 https://github.com/OpenNMS/opennms/commit/e59f48fc4c44b3712531cf60e10261cfa2b2d268 Author: Bobby Krupczak &lt;rdk&lt; at &gt;krupczak.org&gt; Date: 2013-05-20 (Mon, 20 May 2013) Changed paths: M opennms-base-assembly/src/main/filtered/etc/snmp-graph.properties.d/xmp-graph.properties Log Message: ----------- Fixed a few incorrect titles and added more graph entries Commit: 92513035e284cb1cc5e4a4b063cd7877e024441f https://github.com/OpenNMS/opennms/commit/92513035e284cb1cc5e4a4b063cd7877e024441f Author: Benjamin Reed &lt;ranger&lt; at &gt;opennms.org&gt; Date: 2013-05-20 (Mon, 20 May 2013) Changed paths: A smoke-test/.gitignore M smoke-test/src/test/java/org/opennms/smoketest/DistributedMapTest.java M smoke-test/src/test/java/org/opennms/smoketest/MapPageTest.java M smoke-test/src/test/java/org/opennms/smoketest/ServicePageTest.java Log Message: ----------- fix unit tests for new map links Commit: bd019e4da3cfa1e0162bfe2dbf3e059a887d444f https://github.com/OpenNMS/opennms/commit/bd019e4da3cfa1e0162bfe2dbf3e059a887d444f Author: Benjamin Reed &lt;ranger&lt; at &gt;opennms.org&gt; Date: 2013-05-20 (Mon, 20 May 2013) Changed paths: A smoke-test/.gitignore M smoke-test/src/test/java/org/opennms/smoketest/DistributedMapTest.java M smoke-test/src/test/java/org/opennms/smoketest/MapPageTest.java M smoke-test/src/test/java/org/opennms/smoketest/ServicePageTest.java Log Message: ----------- Merge branch '1.12' Commit: 812a0a6cbd84d743152f19d5fe1ea0ae356b1954 https://github.com/OpenNMS/opennms/commit/812a0a6cbd84d743152f19d5fe1ea0ae356b1954 Author: Benjamin Reed &lt;ranger&lt; at &gt;opennms.org&gt; Date: 2013-05-20 (Mon, 20 May 2013) Changed paths: M core/test-api/xml/src/main/java/org/opennms/core/test/xml/XmlTest.java Log Message: ----------- reformat Commit: 59151b01681ae2d8ac078073a4a8430b7befd485 https://github.com/OpenNMS/opennms/commit/59151b01681ae2d8ac078073a4a8430b7befd485 Author: Donald Desloge &lt;desloge&lt; at &gt;opennms.com&gt; Date: 2013-05-20 (Mon, 20 May 2013) Changed paths: M features/topology-map/org.opennms.features.topology.app/src/main/java/org/opennms/features/topology/app/internal/gwt/client/VTopologyComponent.java Log Message: ----------- Disable double click zoom, single click conflicts Commit: e3261612500c40916160ab404b0ff0f7a9179bac https://github.com/OpenNMS/opennms/commit/e3261612500c40916160ab404b0ff0f7a9179bac Author: Benjamin Reed &lt;ranger&lt; at &gt;opennms.org&gt; Date: 2013-05-20 (Mon, 20 May 2013) Changed paths: M core/test-api/xml/src/main/java/org/opennms/core/test/xml/XmlTest.java M opennms-webapp/pom.xml M opennms-webapp/src/main/resources/org/opennms/web/svclayer/applicationContext-svclayer.xml M opennms-webapp/src/test/java/org/opennms/web/rest/AbstractSpringJerseyRestTestCase.java M opennms-webapp/src/test/java/org/opennms/web/rest/AlarmRestServiceTest.java Log Message: ----------- fix typo Commit: 9837cb54a735e35a5f6376a90d1394b111c04b13 https://github.com/OpenNMS/opennms/commit/9837cb54a735e35a5f6376a90d1394b111c04b13 Author: Benjamin Reed &lt;ranger&lt; at &gt;opennms.org&gt; Date: 2013-05-20 (Mon, 20 May 2013) Changed paths: M core/test-api/xml/src/main/java/org/opennms/core/test/xml/XmlTest.java M opennms-webapp/src/test/java/org/opennms/web/rest/AlarmStatsRestServiceTest.java M opennms-webapp/src/test/java/org/opennms/web/rest/NodeRestServiceTest.java Log Message: ----------- more unit test fixes for JDK 7 Commit: 96ee168a4f5660ca5d959d286296a6ba456f2104 https://github.com/OpenNMS/opennms/commit/96ee168a4f5660ca5d959d286296a6ba456f2104 Author: Benjamin Reed &lt;ranger&lt; at &gt;opennms.org&gt; Date: 2013-05-20 (Mon, 20 May 2013) Changed paths: M core/test-api/xml/src/main/java/org/opennms/core/test/xml/XmlTest.java M opennms-webapp/pom.xml M opennms-webapp/src/main/resources/org/opennms/web/svclayer/applicationContext-svclayer.xml M opennms-webapp/src/test/java/org/opennms/web/rest/AbstractSpringJerseyRestTestCase.java M opennms-webapp/src/test/java/org/opennms/web/rest/AlarmRestServiceTest.java M opennms-webapp/src/test/java/org/opennms/web/rest/AlarmStatsRestServiceTest.java M opennms-webapp/src/test/java/org/opennms/web/rest/NodeRestServiceTest.java Log Message: ----------- Merge branch '1.12' Commit: 078dedae3d65f6ef6edb801414d338cf28ca00a2 https://github.com/OpenNMS/opennms/commit/078dedae3d65f6ef6edb801414d338cf28ca00a2 Author: Bobby Krupczak &lt;rdk&lt; at &gt;krupczak.org&gt; Date: 2013-05-20 (Mon, 20 May 2013) Changed paths: M core/test-api/xml/src/main/java/org/opennms/core/test/xml/XmlTest.java M opennms-webapp/pom.xml M opennms-webapp/src/main/resources/org/opennms/web/svclayer/applicationContext-svclayer.xml M opennms-webapp/src/test/java/org/opennms/web/rest/AbstractSpringJerseyRestTestCase.java M opennms-webapp/src/test/java/org/opennms/web/rest/AlarmRestServiceTest.java M opennms-webapp/src/test/java/org/opennms/web/rest/AlarmStatsRestServiceTest.java M opennms-webapp/src/test/java/org/opennms/web/rest/NodeRestServiceTest.java A smoke-test/.gitignore M smoke-test/src/test/java/org/opennms/smoketest/DistributedMapTest.java M smoke-test/src/test/java/org/opennms/smoketest/MapPageTest.java M smoke-test/src/test/java/org/opennms/smoketest/ServicePageTest.java Log Message: ----------- Merge branch '1.12' of https://github.com/rdkgit/opennms into 1.12 Commit: 8cc4ca1150b34e0fe4692de02dbb8af564e18dc9 https://github.com/OpenNMS/opennms/commit/8cc4ca1150b34e0fe4692de02dbb8af564e18dc9 Author: Bobby Krupczak &lt;rdk&lt; at &gt;krupczak.org&gt; Date: 2013-05-20 (Mon, 20 May 2013) Changed paths: M opennms-base-assembly/src/main/filtered/etc/snmp-graph.properties.d/xmp-graph.properties Log Message: ----------- Updated xmp graph titles and added more graphs Commit: f9ede728de0bcf8eea4c28f8336ca66523c1d221 https://github.com/OpenNMS/opennms/commit/f9ede728de0bcf8eea4c28f8336ca66523c1d221 Author: Bobby Krupczak &lt;rdk&lt; at &gt;krupczak.org&gt; Date: 2013-05-20 (Mon, 20 May 2013) Changed paths: M protocols/xmp/src/main/etc/xmp-config.xml M protocols/xmp/src/main/etc/xmp-datacollection-config.xml Log Message: ----------- Updated xmp configs to more useful defaults. Commit: d2979fa49520f9d76c2b1a0198582b8f206bf6d6 https://github.com/OpenNMS/opennms/commit/d2979fa49520f9d76c2b1a0198582b8f206bf6d6 Author: Markus von Rüden &lt;mvr&lt; at &gt;opennms.com&gt; Date: 2013-05-21 (Tue, 21 May 2013) Changed paths: A features/topology-map/org.opennms.features.topology.api/src/main/java/org/opennms/features/topology/api/support/DialogWindow.java M features/topology-map/org.opennms.features.topology.app/src/main/java/org/opennms/features/topology/app/internal/TopologyWidgetTestApplication.java M features/topology-map/plugins/org.opennms.features.topology.plugins.browsers/src/main/java/org/opennms/features/topology/plugins/browsers/AlarmIdColumnLinkGenerator.java M features/topology-map/plugins/org.opennms.features.topology.plugins.browsers/src/main/java/org/opennms/features/topology/plugins/browsers/AlarmTable.java M features/topology-map/plugins/org.opennms.features.topology.plugins.browsers/src/main/java/org/opennms/features/topology/plugins/browsers/AlarmTableCellStyleGenerator.java M features/topology-map/plugins/org.opennms.features.topology.plugins.browsers/src/main/resources/OSGI-INF/blueprint/blueprint.xml M opennms-webapp/src/main/webapp/WEB-INF/jsp/alarm/detail.jsp Log Message: ----------- Fix of #SPC-598 and #SPC-600 Commit: c0487fde6edc34a23800d919722a4137a45c9824 https://github.com/OpenNMS/opennms/commit/c0487fde6edc34a23800d919722a4137a45c9824 Author: Donald Desloge &lt;desloge&lt; at &gt;opennms.com&gt; Date: 2013-05-21 (Tue, 21 May 2013) Changed paths: M features/topology-map/features/runtime-ncs/pom.xml Log Message: ----------- update ncs feature with correct camel http component Commit: bb77691dfd9255575ab16c2c64c5d8f5e6ee5687 https://github.com/OpenNMS/opennms/commit/bb77691dfd9255575ab16c2c64c5d8f5e6ee5687 Author: Benjamin Reed &lt;ranger&lt; at &gt;opennms.org&gt; Date: 2013-05-21 (Tue, 21 May 2013) Changed paths: M features/access-point-monitor/src/main/java/org/opennms/netmgt/model/OnmsAccessPointCollection.java M features/ncs/ncs-persistence/src/main/java/org/opennms/netmgt/ncs/rest/NCSRestService.java M opennms-model/src/main/java/org/opennms/netmgt/model/DataLinkInterfaceList.java M opennms-model/src/main/java/org/opennms/netmgt/model/OnmsAcknowledgmentCollection.java M opennms-model/src/main/java/org/opennms/netmgt/model/OnmsAlarmCollection.java M opennms-model/src/main/java/org/opennms/netmgt/model/OnmsCategoryCollection.java M opennms-model/src/main/java/org/opennms/netmgt/model/OnmsEventCollection.java M opennms-model/src/main/java/org/opennms/netmgt/model/OnmsGroupList.java M opennms-model/src/main/java/org/opennms/netmgt/model/OnmsIpInterfaceList.java M opennms-model/src/main/java/org/opennms/netmgt/model/OnmsLocationAvailDefinitionList.java M opennms-model/src/main/java/org/opennms/netmgt/model/OnmsMapElementList.java M opennms-model/src/main/java/org/opennms/netmgt/model/OnmsMapList.java M opennms-model/src/main/java/org/opennms/netmgt/model/OnmsMonitoredServiceList.java M opennms-model/src/main/java/org/opennms/netmgt/model/OnmsMonitoringLocationDefinitionList.java M opennms-model/src/main/java/org/opennms/netmgt/model/OnmsNodeList.java M opennms-model/src/main/java/org/opennms/netmgt/model/OnmsNotificationCollection.java M opennms-model/src/main/java/org/opennms/netmgt/model/OnmsOutageCollection.java M opennms-model/src/main/java/org/opennms/netmgt/model/OnmsSnmpInterfaceList.java M opennms-model/src/main/java/org/opennms/netmgt/model/OnmsUserList.java M opennms-provision/opennms-provision-persistence/src/main/java/org/opennms/netmgt/provision/persist/foreignsource/DetectorCollection.java M opennms-provision/opennms-provision-persistence/src/main/java/org/opennms/netmgt/provision/persist/foreignsource/ForeignSourceCollection.java M opennms-provision/opennms-provision-persistence/src/main/java/org/opennms/netmgt/provision/persist/foreignsource/PolicyCollection.java M opennms-provision/opennms-provision-persistence/src/main/java/org/opennms/netmgt/provision/persist/requisition/RequisitionAssetCollection.java M opennms-provision/opennms-provision-persistence/src/main/java/org/opennms/netmgt/provision/persist/requisition/RequisitionCategoryCollection.java M opennms-provision/opennms-provision-persistence/src/main/java/org/opennms/netmgt/provision/persist/requisition/RequisitionCollection.java M opennms-provision/opennms-provision-persistence/src/main/java/org/opennms/netmgt/provision/persist/requisition/RequisitionInterfaceCollection.java M opennms-provision/opennms-provision-persistence/src/main/java/org/opennms/netmgt/provision/persist/requisition/RequisitionMonitoredServiceCollection.java M opennms-provision/opennms-provision-persistence/src/main/java/org/opennms/netmgt/provision/persist/requisition/RequisitionNodeCollection.java M opennms-tools/opennms-tip/opennms-tip-ram/src/main/java/org/opennms/tip/ram/AlarmList.java M opennms-webapp/src/main/java/org/opennms/web/rest/KscRestService.java Log Message: ----------- guard againts clearing a list when calling addAll(this) on a subclassed list Commit: a223d580f0335d9eb50363d4a8935c0ccb5aa42d https://github.com/OpenNMS/opennms/commit/a223d580f0335d9eb50363d4a8935c0ccb5aa42d Author: Benjamin Reed &lt;ranger&lt; at &gt;opennms.org&gt; Date: 2013-05-21 (Tue, 21 May 2013) Changed paths: M features/access-point-monitor/src/main/java/org/opennms/netmgt/model/OnmsAccessPointCollection.java M features/ncs/ncs-persistence/src/main/java/org/opennms/netmgt/ncs/rest/NCSRestService.java M opennms-model/src/main/java/org/opennms/netmgt/model/DataLinkInterfaceList.java M opennms-model/src/main/java/org/opennms/netmgt/model/OnmsAcknowledgmentCollection.java M opennms-model/src/main/java/org/opennms/netmgt/model/OnmsAlarmCollection.java M opennms-model/src/main/java/org/opennms/netmgt/model/OnmsCategoryCollection.java M opennms-model/src/main/java/org/opennms/netmgt/model/OnmsEventCollection.java M opennms-model/src/main/java/org/opennms/netmgt/model/OnmsGroupList.java M opennms-model/src/main/java/org/opennms/netmgt/model/OnmsIpInterfaceList.java M opennms-model/src/main/java/org/opennms/netmgt/model/OnmsLocationAvailDefinitionList.java M opennms-model/src/main/java/org/opennms/netmgt/model/OnmsMapElementList.java M opennms-model/src/main/java/org/opennms/netmgt/model/OnmsMapList.java M opennms-model/src/main/java/org/opennms/netmgt/model/OnmsMonitoredServiceList.java M opennms-model/src/main/java/org/opennms/netmgt/model/OnmsMonitoringLocationDefinitionList.java M opennms-model/src/main/java/org/opennms/netmgt/model/OnmsNodeList.java M opennms-model/src/main/java/org/opennms/netmgt/model/OnmsNotificationCollection.java M opennms-model/src/main/java/org/opennms/netmgt/model/OnmsOutageCollection.java M opennms-model/src/main/java/org/opennms/netmgt/model/OnmsSnmpInterfaceList.java M opennms-model/src/main/java/org/opennms/netmgt/model/OnmsUserList.java M opennms-provision/opennms-provision-persistence/src/main/java/org/opennms/netmgt/provision/persist/foreignsource/DetectorCollection.java M opennms-provision/opennms-provision-persistence/src/main/java/org/opennms/netmgt/provision/persist/foreignsource/ForeignSourceCollection.java M opennms-provision/opennms-provision-persistence/src/main/java/org/opennms/netmgt/provision/persist/foreignsource/PolicyCollection.java M opennms-provision/opennms-provision-persistence/src/main/java/org/opennms/netmgt/provision/persist/requisition/RequisitionAssetCollection.java M opennms-provision/opennms-provision-persistence/src/main/java/org/opennms/netmgt/provision/persist/requisition/RequisitionCategoryCollection.java M opennms-provision/opennms-provision-persistence/src/main/java/org/opennms/netmgt/provision/persist/requisition/RequisitionCollection.java M opennms-provision/opennms-provision-persistence/src/main/java/org/opennms/netmgt/provision/persist/requisition/RequisitionInterfaceCollection.java M opennms-provision/opennms-provision-persistence/src/main/java/org/opennms/netmgt/provision/persist/requisition/RequisitionMonitoredServiceCollection.java M opennms-provision/opennms-provision-persistence/src/main/java/org/opennms/netmgt/provision/persist/requisition/RequisitionNodeCollection.java M opennms-tools/opennms-tip/opennms-tip-ram/src/main/java/org/opennms/tip/ram/AlarmList.java M opennms-webapp/src/main/java/org/opennms/web/rest/KscRestService.java Log Message: ----------- Merge branch '1.12' Commit: 75a56269543b2fd891b9f96e1a25ecccabecea07 https://github.com/OpenNMS/opennms/commit/75a56269543b2fd891b9f96e1a25ecccabecea07 Author: Donald Desloge &lt;desloge&lt; at &gt;opennms.com&gt; Date: 2013-05-21 (Tue, 21 May 2013) Changed paths: M features/topology-map/org.opennms.features.topology.app/src/main/java/org/opennms/features/topology/app/internal/VertexSelectionTree.java Log Message: ----------- SPC-536, remove unneeded itemSetChanged event. Caused shift click not to work Commit: 569bddbad9419b9edc82983f3ff2fc28e3c1006d https://github.com/OpenNMS/opennms/commit/569bddbad9419b9edc82983f3ff2fc28e3c1006d Author: Alejandro Galue &lt;agalue&lt; at &gt;opennms.org&gt; Date: 2013-05-22 (Wed, 22 May 2013) Changed paths: M opennms-services/src/main/java/org/opennms/netmgt/poller/monitors/PageSequenceMonitor.java Log Message: ----------- Fix for enhancement NMS-5884 Commit: 747c57e6d616515a8c9128ebcb37e75eae4982bb https://github.com/OpenNMS/opennms/commit/747c57e6d616515a8c9128ebcb37e75eae4982bb Author: Alejandro Galue &lt;agalue&lt; at &gt;opennms.org&gt; Date: 2013-05-22 (Wed, 22 May 2013) Changed paths: M opennms-services/src/main/java/org/opennms/netmgt/poller/monitors/PageSequenceMonitor.java Log Message: ----------- Merge remote-tracking branch 'origin/1.10' into 1.12 Commit: 95ad9ce89c68dd0459b97af5b58c1ec768ec4f40 https://github.com/OpenNMS/opennms/commit/95ad9ce89c68dd0459b97af5b58c1ec768ec4f40 Author: Bobby Krupczak &lt;rdk&lt; at &gt;krupczak.org&gt; Date: 2013-05-22 (Wed, 22 May 2013) Changed paths: M protocols/xmp/src/main/etc/xmp-datacollection-config.xml Log Message: ----------- Fixed includes install.share.dir variable rather than hardcoding location Commit: 9cdb7796ab55741785d10da71030a7070991bda9 https://github.com/OpenNMS/opennms/commit/9cdb7796ab55741785d10da71030a7070991bda9 Author: jeffgdotorg &lt;jeffg&lt; at &gt;opennms.org&gt; Date: 2013-05-22 (Wed, 22 May 2013) Changed paths: M opennms-base-assembly/src/main/filtered/etc/snmp-graph.properties.d/xmp-graph.properties M protocols/xmp/src/main/etc/xmp-config.xml M protocols/xmp/src/main/etc/xmp-datacollection-config.xml Log Message: ----------- Merge pull request #12 from rdkgit/1.12 Taking in Bobby's updated graph definitions and other XMP-related improvements for 1.12. Commit: bed9bc9ba4dac7c9cf46709d28cfc058ab5546fe https://github.com/OpenNMS/opennms/commit/bed9bc9ba4dac7c9cf46709d28cfc058ab5546fe Author: Alejandro Galue &lt;agalue&lt; at &gt;opennms.org&gt; Date: 2013-05-22 (Wed, 22 May 2013) Changed paths: M opennms-base-assembly/src/main/filtered/etc/snmp-graph.properties.d/xmp-graph.properties M protocols/xmp/src/main/etc/xmp-config.xml M protocols/xmp/src/main/etc/xmp-datacollection-config.xml Log Message: ----------- Merge branch '1.12' of github.com:OpenNMS/opennms into 1.12 Commit: 4af8c7b82b5c1afa966e5b4058581fbf960316e3 https://github.com/OpenNMS/opennms/commit/4af8c7b82b5c1afa966e5b4058581fbf960316e3 Author: Seth Leger &lt;seth&lt; at &gt;opennms.org&gt; Date: 2013-05-22 (Wed, 22 May 2013) Changed paths: M features/topology-map/plugins/org.opennms.features.topology.plugins.browsers/src/main/java/org/opennms/features/topology/plugins/browsers/AlarmTable.java Log Message: ----------- Changed caption on deselection link to address bug SPC-567. Commit: a8a3acefa751e84c474bab77cd80eaa8ccc5f9f4 https://github.com/OpenNMS/opennms/commit/a8a3acefa751e84c474bab77cd80eaa8ccc5f9f4 Author: Jeff Gehlbach &lt;jeffg&lt; at &gt;opennms.org&gt; Date: 2013-05-22 (Wed, 22 May 2013) Changed paths: M features/vaadin-snmp-events-and-metrics/src/main/java/org/opennms/features/vaadin/mibcompiler/services/JsmiMibParser.java A features/vaadin-snmp-events-and-metrics/src/test/java/org/opennms/features/vaadin/mibcompiler/SPC592.java A features/vaadin-snmp-events-and-metrics/src/test/resources/DIFFSERV-DSCP-TC.mib A features/vaadin-snmp-events-and-metrics/src/test/resources/DIFFSERV-MIB.mib A features/vaadin-snmp-events-and-metrics/src/test/resources/INET-ADDRESS-MIB.txt A features/vaadin-snmp-events-and-metrics/src/test/resources/INTEGRATED-SERVICES-MIB.mib A features/vaadin-snmp-events-and-metrics/src/test/resources/ISIS-MIB.mib Log Message: ----------- Fix for issue SPC-592 JsmiMibParser was not dropping a trailing .0 from the id mask-element of non-standard trap types per RFC3584 sec 3.2 section 1 bullet 1 sub-bullet 2 (whew), resulting in event masks that failed to match incoming traps. Commit: 90e28f58cd3e777f1bd4b6b5d8ff382139db96d5 https://github.com/OpenNMS/opennms/commit/90e28f58cd3e777f1bd4b6b5d8ff382139db96d5 Author: Benjamin Reed &lt;ranger&lt; at &gt;opennms.org&gt; Date: 2013-05-22 (Wed, 22 May 2013) Changed paths: M features/vaadin-snmp-events-and-metrics/src/main/java/org/opennms/features/vaadin/mibcompiler/services/JsmiMibParser.java A features/vaadin-snmp-events-and-metrics/src/test/java/org/opennms/features/vaadin/mibcompiler/SPC592.java A features/vaadin-snmp-events-and-metrics/src/test/resources/DIFFSERV-DSCP-TC.mib A features/vaadin-snmp-events-and-metrics/src/test/resources/DIFFSERV-MIB.mib A features/vaadin-snmp-events-and-metrics/src/test/resources/INET-ADDRESS-MIB.txt A features/vaadin-snmp-events-and-metrics/src/test/resources/INTEGRATED-SERVICES-MIB.mib A features/vaadin-snmp-events-and-metrics/src/test/resources/ISIS-MIB.mib M opennms-base-assembly/src/main/filtered/etc/snmp-graph.properties.d/xmp-graph.properties M opennms-services/src/main/java/org/opennms/netmgt/poller/monitors/PageSequenceMonitor.java M protocols/xmp/src/main/etc/xmp-config.xml M protocols/xmp/src/main/etc/xmp-datacollection-config.xml Log Message: ----------- Merge branch '1.12' Commit: 76275a3e15926abf9ccf8f3a2b99a03cb732bd33 https://github.com/OpenNMS/opennms/commit/76275a3e15926abf9ccf8f3a2b99a03cb732bd33 Author: Jeff Gehlbach &lt;jeffg&lt; at &gt;opennms.org&gt; Date: 2013-05-22 (Wed, 22 May 2013) Changed paths: M opennms-base-assembly/src/main/filtered/etc/opennms.properties Log Message: ----------- Fix NMS-5886: Distributed map popup unknown map implementation on new install Commit: 42a67d9474d68473e60381d7d82a673f55889f82 https://github.com/OpenNMS/opennms/commit/42a67d9474d68473e60381d7d82a673f55889f82 Author: Markus von Rüden &lt;mvr&lt; at &gt;opennms.com&gt; Date: 2013-05-23 (Thu, 23 May 2013) Changed paths: M opennms-webapp/src/main/java/org/opennms/web/rest/OnmsRestService.java Log Message: ----------- Fix of #SPC-480 Commit: 61c353900a06f235229db25b28bc37846aa4d31b https://github.com/OpenNMS/opennms/commit/61c353900a06f235229db25b28bc37846aa4d31b Author: Markus von Rüden &lt;mvr&lt; at &gt;opennms.com&gt; Date: 2013-05-23 (Thu, 23 May 2013) Changed paths: M opennms-dao/src/main/java/org/opennms/netmgt/dao/hibernate/AlarmRepositoryHibernate.java M opennms-webapp/src/main/java/org/opennms/web/controller/alarm/AlarmDetailController.java M opennms-webapp/src/main/webapp/WEB-INF/dispatcher-servlet.xml M opennms-webapp/src/main/webapp/WEB-INF/jsp/alarm/detail.jsp Log Message: ----------- Fix of alarm page: Clear of Memos did not work anymore Commit: c4e337d300ca0ceca70f9f268d087c8fd34f96db https://github.com/OpenNMS/opennms/commit/c4e337d300ca0ceca70f9f268d087c8fd34f96db Author: Seth Leger &lt;seth&lt; at &gt;opennms.org&gt; Date: 2013-05-23 (Thu, 23 May 2013) Changed paths: A features/topology-map/plugins/org.opennms.features.topology.plugins.browsers/src/main/java/org/opennms/features/topology/plugins/browsers/NodeTable.java M features/topology-map/plugins/org.opennms.features.topology.plugins.browsers/src/main/java/org/opennms/features/topology/plugins/browsers/OnmsDaoContainer.java M features/topology-map/plugins/org.opennms.features.topology.plugins.browsers/src/main/resources/OSGI-INF/blueprint/blueprint.xml Log Message: ----------- Added ability to perform additional Comparator-based sorting inside the OnmsDaoContainer so that we can sort on properties that are &lt; at &gt;Transient and cannot easily be sorted in the database with Hibernate. Addresses bug SPC-579. Commit: a72a63caecf77a30f742fa2fd0567184dd945ddb https://github.com/OpenNMS/opennms/commit/a72a63caecf77a30f742fa2fd0567184dd945ddb Author: Benjamin Reed &lt;ranger&lt; at &gt;opennms.org&gt; Date: 2013-05-23 (Thu, 23 May 2013) Changed paths: M opennms-model/src/main/java/org/opennms/netmgt/model/OnmsAssetRecord.java Log Message: ----------- Work around JAXB/JDK7 issue http://bamboo.internal.opennms.com:8085/browse/OPENNMS-MASTER17-TEST-89 Commit: 08fdb116327b175c6faa99f6f983d8b9ac79bf93 https://github.com/OpenNMS/opennms/commit/08fdb116327b175c6faa99f6f983d8b9ac79bf93 Author: Benjamin Reed &lt;ranger&lt; at &gt;opennms.org&gt; Date: 2013-05-23 (Thu, 23 May 2013) Changed paths: M opennms-base-assembly/src/main/filtered/etc/opennms.properties M opennms-model/src/main/java/org/opennms/netmgt/model/OnmsAssetRecord.java Log Message: ----------- Merge branch '1.12' Commit: 66a2d1558a4b58b504ae23821264ea74ac76c456 https://github.com/OpenNMS/opennms/commit/66a2d1558a4b58b504ae23821264ea74ac76c456 Author: Benjamin Reed &lt;ranger&lt; at &gt;opennms.org&gt; Date: 2013-05-23 (Thu, 23 May 2013) Changed paths: A opennms-model/src/main/java/org/opennms/netmgt/model/OnmsAnyTypeAdapter.java Log Message: ----------- forgot to add this for the previous fix Commit: c99c2fbfa957c643a42726fd354501897c9e3959 https://github.com/OpenNMS/opennms/commit/c99c2fbfa957c643a42726fd354501897c9e3959 Author: Benjamin Reed &lt;ranger&lt; at &gt;opennms.org&gt; Date: 2013-05-23 (Thu, 23 May 2013) Changed paths: A opennms-model/src/main/java/org/opennms/netmgt/model/OnmsAnyTypeAdapter.java Log Message: ----------- Merge branch '1.12' Commit: 3eead2b97e857fbcdf3b7d8cb9e6e3aab252d59f https://github.com/OpenNMS/opennms/commit/3eead2b97e857fbcdf3b7d8cb9e6e3aab252d59f Author: Benjamin Reed &lt;ranger&lt; at &gt;opennms.org&gt; Date: 2013-05-23 (Thu, 23 May 2013) Changed paths: M opennms-icmp/opennms-icmp-jni/pom.xml Log Message: ----------- jicmp 1.4.1 dependency Commit: 44bf5f46b75489c529fc304de177e8ed9b9a6d10 https://github.com/OpenNMS/opennms/commit/44bf5f46b75489c529fc304de177e8ed9b9a6d10 Author: Benjamin Reed &lt;ranger&lt; at &gt;opennms.org&gt; Date: 2013-05-23 (Thu, 23 May 2013) Changed paths: M opennms-icmp/opennms-icmp-jni/pom.xml Log Message: ----------- Merge branch '1.12' Commit: d9f3c2b686148653c880c4d08adf45a4479007ca https://github.com/OpenNMS/opennms/commit/d9f3c2b686148653c880c4d08adf45a4479007ca Author: Benjamin Reed &lt;ranger&lt; at &gt;opennms.org&gt; Date: 2013-05-23 (Thu, 23 May 2013) Changed paths: M core/test-api/xml/src/main/java/org/opennms/core/test/xml/XmlTest.java M dependencies/camel/pom.xml M features/access-point-monitor/src/main/java/org/opennms/netmgt/model/OnmsAccessPointCollection.java M features/ncs/ncs-persistence/src/main/java/org/opennms/netmgt/ncs/rest/NCSRestService.java M features/topology-map/features/runtime-ncs/pom.xml A features/topology-map/org.opennms.features.topology.api/src/main/java/org/opennms/features/topology/api/support/DialogWindow.java M features/topology-map/org.opennms.features.topology.app/src/main/java/org/opennms/features/topology/app/internal/TopologyWidgetTestApplication.java M features/topology-map/org.opennms.features.topology.app/src/main/java/org/opennms/features/topology/app/internal/VertexSelectionTree.java M features/topology-map/org.opennms.features.topology.app/src/main/java/org/opennms/features/topology/app/internal/gwt/client/VTopologyComponent.java M features/topology-map/plugins/org.opennms.features.topology.plugins.browsers/src/main/java/org/opennms/features/topology/plugins/browsers/AlarmIdColumnLinkGenerator.java M features/topology-map/plugins/org.opennms.features.topology.plugins.browsers/src/main/java/org/opennms/features/topology/plugins/browsers/AlarmTable.java M features/topology-map/plugins/org.opennms.features.topology.plugins.browsers/src/main/java/org/opennms/features/topology/plugins/browsers/AlarmTableCellStyleGenerator.java M features/topology-map/plugins/org.opennms.features.topology.plugins.browsers/src/main/java/org/opennms/features/topology/plugins/browsers/CheckboxGenerator.java A features/topology-map/plugins/org.opennms.features.topology.plugins.browsers/src/main/java/org/opennms/features/topology/plugins/browsers/NodeTable.java M features/topology-map/plugins/org.opennms.features.topology.plugins.browsers/src/main/java/org/opennms/features/topology/plugins/browsers/OnmsDaoContainer.java M features/topology-map/plugins/org.opennms.features.topology.plugins.browsers/src/main/resources/OSGI-INF/blueprint/blueprint.xml M features/topology-map/plugins/org.opennms.features.topology.plugins.ncs/pom.xml A features/topology-map/plugins/org.opennms.features.topology.plugins.ncs/src/main/java/org/opennms/features/topology/plugins/ncs/internal/CustomHttpClientConfigurer.java M features/topology-map/plugins/org.opennms.features.topology.plugins.ncs/src/main/resources/OSGI-INF/blueprint/blueprint.xml M features/topology-map/plugins/org.opennms.features.topology.plugins.ncs/src/test/java/org/opennms/features/topology/plugins/ncs/NCSPathProviderTest.java M features/vaadin-snmp-events-and-metrics/src/main/java/org/opennms/features/vaadin/mibcompiler/services/JsmiMibParser.java A features/vaadin-snmp-events-and-metrics/src/test/java/org/opennms/features/vaadin/mibcompiler/SPC592.java A features/vaadin-snmp-events-and-metrics/src/test/resources/DIFFSERV-DSCP-TC.mib A features/vaadin-snmp-events-and-metrics/src/test/resources/DIFFSERV-MIB.mib A features/vaadin-snmp-events-and-metrics/src/test/resources/INET-ADDRESS-MIB.txt A features/vaadin-snmp-events-and-metrics/src/test/resources/INTEGRATED-SERVICES-MIB.mib A features/vaadin-snmp-events-and-metrics/src/test/resources/ISIS-MIB.mib M opennms-base-assembly/src/main/filtered/bin/opennms M opennms-base-assembly/src/main/filtered/etc/opennms.properties M opennms-base-assembly/src/main/filtered/etc/snmp-graph.properties.d/xmp-graph.properties M opennms-dao/src/main/java/org/opennms/netmgt/dao/hibernate/AlarmRepositoryHibernate.java M opennms-icmp/opennms-icmp-jni/pom.xml M opennms-model/src/main/java/org/opennms/netmgt/model/DataLinkInterfaceList.java M opennms-model/src/main/java/org/opennms/netmgt/model/OnmsAcknowledgmentCollection.java M opennms-model/src/main/java/org/opennms/netmgt/model/OnmsAlarmCollection.java A opennms-model/src/main/java/org/opennms/netmgt/model/OnmsAnyTypeAdapter.java M opennms-model/src/main/java/org/opennms/netmgt/model/OnmsAssetRecord.java M opennms-model/src/main/java/org/opennms/netmgt/model/OnmsCategoryCollection.java M opennms-model/src/main/java/org/opennms/netmgt/model/OnmsEventCollection.java M opennms-model/src/main/java/org/opennms/netmgt/model/OnmsGroupList.java M opennms-model/src/main/java/org/opennms/netmgt/model/OnmsIpInterfaceList.java M opennms-model/src/main/java/org/opennms/netmgt/model/OnmsLocationAvailDefinitionList.java M opennms-model/src/main/java/org/opennms/netmgt/model/OnmsMapElementList.java M opennms-model/src/main/java/org/opennms/netmgt/model/OnmsMapList.java M opennms-model/src/main/java/org/opennms/netmgt/model/OnmsMonitoredServiceList.java M opennms-model/src/main/java/org/opennms/netmgt/model/OnmsMonitoringLocationDefinitionList.java M opennms-model/src/main/java/org/opennms/netmgt/model/OnmsNodeList.java M opennms-model/src/main/java/org/opennms/netmgt/model/OnmsNotificationCollection.java M opennms-model/src/main/java/org/opennms/netmgt/model/OnmsOutageCollection.java M opennms-model/src/main/java/org/opennms/netmgt/model/OnmsSnmpInterfaceList.java M opennms-model/src/main/java/org/opennms/netmgt/model/OnmsUserList.java M opennms-provision/opennms-provision-persistence/src/main/java/org/opennms/netmgt/provision/persist/foreignsource/DetectorCollection.java M opennms-provision/opennms-provision-persistence/src/main/java/org/opennms/netmgt/provision/persist/foreignsource/ForeignSourceCollection.java M opennms-provision/opennms-provision-persistence/src/main/java/org/opennms/netmgt/provision/persist/foreignsource/PolicyCollection.java M opennms-provision/opennms-provision-persistence/src/main/java/org/opennms/netmgt/provision/persist/requisition/RequisitionAssetCollection.java M opennms-provision/opennms-provision-persistence/src/main/java/org/opennms/netmgt/provision/persist/requisition/RequisitionCategoryCollection.java M opennms-provision/opennms-provision-persistence/src/main/java/org/opennms/netmgt/provision/persist/requisition/RequisitionCollection.java M opennms-provision/opennms-provision-persistence/src/main/java/org/opennms/netmgt/provision/persist/requisition/RequisitionInterfaceCollection.java M opennms-provision/opennms-provision-persistence/src/main/java/org/opennms/netmgt/provision/persist/requisition/RequisitionMonitoredServiceCollection.java M opennms-provision/opennms-provision-persistence/src/main/java/org/opennms/netmgt/provision/persist/requisition/RequisitionNodeCollection.java M opennms-services/src/main/java/org/opennms/netmgt/poller/monitors/PageSequenceMonitor.java M opennms-tools/opennms-tip/opennms-tip-ram/src/main/java/org/opennms/tip/ram/AlarmList.java M opennms-webapp/pom.xml M opennms-webapp/src/main/java/org/opennms/web/controller/alarm/AlarmDetailController.java M opennms-webapp/src/main/java/org/opennms/web/rest/KscRestService.java M opennms-webapp/src/main/java/org/opennms/web/rest/OnmsRestService.java M opennms-webapp/src/main/resources/org/opennms/web/svclayer/applicationContext-svclayer.xml M opennms-webapp/src/main/webapp/WEB-INF/dispatcher-servlet.xml M opennms-webapp/src/main/webapp/WEB-INF/jsp/alarm/detail.jsp M opennms-webapp/src/test/java/org/opennms/web/rest/AbstractSpringJerseyRestTestCase.java M opennms-webapp/src/test/java/org/opennms/web/rest/AlarmRestServiceTest.java M opennms-webapp/src/test/java/org/opennms/web/rest/AlarmStatsRestServiceTest.java M opennms-webapp/src/test/java/org/opennms/web/rest/NodeRestServiceTest.java M protocols/xmp/src/main/etc/xmp-config.xml M protocols/xmp/src/main/etc/xmp-datacollection-config.xml A smoke-test/.gitignore M smoke-test/src/test/java/org/opennms/smoketest/DistributedMapTest.java M smoke-test/src/test/java/org/opennms/smoketest/MapPageTest.java M smoke-test/src/test/java/org/opennms/smoketest/ServicePageTest.java Log Message: ----------- Merge remote-tracking branch 'origin/master' into pull-requests Compare: https://github.com/OpenNMS/opennms/compare/38f3c207fd11...d9f3c2b68614 ------------------------------------------------------------------------------ Try New Relic Now &amp; We'll Send You this Cool Shirt New Relic is the only SaaS-based application performance monitoring service that delivers powerful full stack analytics. Optimize and monitor your browser, app, &amp; servers with just a few lines of code. Try New Relic and get this awesome Nerd Life shirt! http://p.sf.net/sfu/newrelic_d2d_may_______________________________________________ Please read the OpenNMS Mailing List FAQ: http://www.opennms.org/wiki/index.php?page=MailingListFaq opennms-cvs mailing list To *unsubscribe* or change your subscription options, see the bottom of this page: https://lists.sourceforge.net/lists/listinfo/opennms-cvs</pre> Benjamin Reed 2013-05-23T15:14:01 [OpenNMS/opennms] 3eead2: jicmp 1.4.1 dependency http://permalink.gmane.org/gmane.network.opennms.cvs/29393 <pre> Branch: refs/heads/master Home: https://github.com/OpenNMS/opennms Commit: 3eead2b97e857fbcdf3b7d8cb9e6e3aab252d59f https://github.com/OpenNMS/opennms/commit/3eead2b97e857fbcdf3b7d8cb9e6e3aab252d59f Author: Benjamin Reed &lt;ranger&lt; at &gt;opennms.org&gt; Date: 2013-05-23 (Thu, 23 May 2013) Changed paths: M opennms-icmp/opennms-icmp-jni/pom.xml Log Message: ----------- jicmp 1.4.1 dependency Commit: 44bf5f46b75489c529fc304de177e8ed9b9a6d10 https://github.com/OpenNMS/opennms/commit/44bf5f46b75489c529fc304de177e8ed9b9a6d10 Author: Benjamin Reed &lt;ranger&lt; at &gt;opennms.org&gt; Date: 2013-05-23 (Thu, 23 May 2013) Changed paths: M opennms-icmp/opennms-icmp-jni/pom.xml Log Message: ----------- Merge branch '1.12' Compare: https://github.com/OpenNMS/opennms/compare/c99c2fbfa957...44bf5f46b754 ------------------------------------------------------------------------------ Try New Relic Now &amp; We'll Send You this Cool Shirt New Relic is the only SaaS-based application performance monitoring service that delivers powerful full stack analytics. Optimize and monitor your browser, app, &amp; servers with just a few lines of code. Try New Relic and get this awesome Nerd Life shirt! http://p.sf.net/sfu/newrelic_d2d_may_______________________________________________ Please read the OpenNMS Mailing List FAQ: http://www.opennms.org/wiki/index.php?page=MailingListFaq opennms-cvs mailing list To *unsubscribe* or change your subscription options, see the bottom of this page: https://lists.sourceforge.net/lists/listinfo/opennms-cvs</pre> Benjamin Reed 2013-05-23T15:03:28 [OpenNMS/opennms] 3eead2: jicmp 1.4.1 dependency http://permalink.gmane.org/gmane.network.opennms.cvs/29392 <pre> Branch: refs/heads/1.12 Home: https://github.com/OpenNMS/opennms Commit: 3eead2b97e857fbcdf3b7d8cb9e6e3aab252d59f https://github.com/OpenNMS/opennms/commit/3eead2b97e857fbcdf3b7d8cb9e6e3aab252d59f Author: Benjamin Reed &lt;ranger&lt; at &gt;opennms.org&gt; Date: 2013-05-23 (Thu, 23 May 2013) Changed paths: M opennms-icmp/opennms-icmp-jni/pom.xml Log Message: ----------- jicmp 1.4.1 dependency ------------------------------------------------------------------------------ Try New Relic Now &amp; We'll Send You this Cool Shirt New Relic is the only SaaS-based application performance monitoring service that delivers powerful full stack analytics. Optimize and monitor your browser, app, &amp; servers with just a few lines of code. Try New Relic and get this awesome Nerd Life shirt! http://p.sf.net/sfu/newrelic_d2d_may_______________________________________________ Please read the OpenNMS Mailing List FAQ: http://www.opennms.org/wiki/index.php?page=MailingListFaq opennms-cvs mailing list To *unsubscribe* or change your subscription options, see the bottom of this page: https://lists.sourceforge.net/lists/listinfo/opennms-cvs</pre> Benjamin Reed 2013-05-23T15:03:15 [OpenNMS/opennms] 66a2d1: forgot to add this for theprevious fix http://permalink.gmane.org/gmane.network.opennms.cvs/29391 <pre> Branch: refs/heads/master Home: https://github.com/OpenNMS/opennms Commit: 66a2d1558a4b58b504ae23821264ea74ac76c456 https://github.com/OpenNMS/opennms/commit/66a2d1558a4b58b504ae23821264ea74ac76c456 Author: Benjamin Reed &lt;ranger&lt; at &gt;opennms.org&gt; Date: 2013-05-23 (Thu, 23 May 2013) Changed paths: A opennms-model/src/main/java/org/opennms/netmgt/model/OnmsAnyTypeAdapter.java Log Message: ----------- forgot to add this for the previous fix Commit: c99c2fbfa957c643a42726fd354501897c9e3959 https://github.com/OpenNMS/opennms/commit/c99c2fbfa957c643a42726fd354501897c9e3959 Author: Benjamin Reed &lt;ranger&lt; at &gt;opennms.org&gt; Date: 2013-05-23 (Thu, 23 May 2013) Changed paths: A opennms-model/src/main/java/org/opennms/netmgt/model/OnmsAnyTypeAdapter.java Log Message: ----------- Merge branch '1.12' Compare: https://github.com/OpenNMS/opennms/compare/08fdb116327b...c99c2fbfa957 ------------------------------------------------------------------------------ Try New Relic Now &amp; We'll Send You this Cool Shirt New Relic is the only SaaS-based application performance monitoring service that delivers powerful full stack analytics. Optimize and monitor your browser, app, &amp; servers with just a few lines of code. Try New Relic and get this awesome Nerd Life shirt! http://p.sf.net/sfu/newrelic_d2d_may_______________________________________________ Please read the OpenNMS Mailing List FAQ: http://www.opennms.org/wiki/index.php?page=MailingListFaq opennms-cvs mailing list To *unsubscribe* or change your subscription options, see the bottom of this page: https://lists.sourceforge.net/lists/listinfo/opennms-cvs</pre> Benjamin Reed 2013-05-23T14:56:38 [OpenNMS/opennms] 66a2d1: forgot to add this for theprevious fix http://permalink.gmane.org/gmane.network.opennms.cvs/29390 <pre> Branch: refs/heads/1.12 Home: https://github.com/OpenNMS/opennms Commit: 66a2d1558a4b58b504ae23821264ea74ac76c456 https://github.com/OpenNMS/opennms/commit/66a2d1558a4b58b504ae23821264ea74ac76c456 Author: Benjamin Reed &lt;ranger&lt; at &gt;opennms.org&gt; Date: 2013-05-23 (Thu, 23 May 2013) Changed paths: A opennms-model/src/main/java/org/opennms/netmgt/model/OnmsAnyTypeAdapter.java Log Message: ----------- forgot to add this for the previous fix ------------------------------------------------------------------------------ Try New Relic Now &amp; We'll Send You this Cool Shirt New Relic is the only SaaS-based application performance monitoring service that delivers powerful full stack analytics. Optimize and monitor your browser, app, &amp; servers with just a few lines of code. Try New Relic and get this awesome Nerd Life shirt! http://p.sf.net/sfu/newrelic_d2d_may_______________________________________________ Please read the OpenNMS Mailing List FAQ: http://www.opennms.org/wiki/index.php?page=MailingListFaq opennms-cvs mailing list To *unsubscribe* or change your subscription options, see the bottom of this page: https://lists.sourceforge.net/lists/listinfo/opennms-cvs</pre> Benjamin Reed 2013-05-23T14:56:29 [OpenNMS/opennms] 76275a: Fix NMS-5886: Distributed map popup unknown map im... http://permalink.gmane.org/gmane.network.opennms.cvs/29389 <pre> Branch: refs/heads/master Home: https://github.com/OpenNMS/opennms Commit: 76275a3e15926abf9ccf8f3a2b99a03cb732bd33 https://github.com/OpenNMS/opennms/commit/76275a3e15926abf9ccf8f3a2b99a03cb732bd33 Author: Jeff Gehlbach &lt;jeffg&lt; at &gt;opennms.org&gt; Date: 2013-05-22 (Wed, 22 May 2013) Changed paths: M opennms-base-assembly/src/main/filtered/etc/opennms.properties Log Message: ----------- Fix NMS-5886: Distributed map popup unknown map implementation on new install Commit: a72a63caecf77a30f742fa2fd0567184dd945ddb https://github.com/OpenNMS/opennms/commit/a72a63caecf77a30f742fa2fd0567184dd945ddb Author: Benjamin Reed &lt;ranger&lt; at &gt;opennms.org&gt; Date: 2013-05-23 (Thu, 23 May 2013) Changed paths: M opennms-model/src/main/java/org/opennms/netmgt/model/OnmsAssetRecord.java Log Message: ----------- Work around JAXB/JDK7 issue http://bamboo.internal.opennms.com:8085/browse/OPENNMS-MASTER17-TEST-89 Commit: 08fdb116327b175c6faa99f6f983d8b9ac79bf93 https://github.com/OpenNMS/opennms/commit/08fdb116327b175c6faa99f6f983d8b9ac79bf93 Author: Benjamin Reed &lt;ranger&lt; at &gt;opennms.org&gt; Date: 2013-05-23 (Thu, 23 May 2013) Changed paths: M opennms-base-assembly/src/main/filtered/etc/opennms.properties M opennms-model/src/main/java/org/opennms/netmgt/model/OnmsAssetRecord.java Log Message: ----------- Merge branch '1.12' Compare: https://github.com/OpenNMS/opennms/compare/c4e337d300ca...08fdb116327b ------------------------------------------------------------------------------ Try New Relic Now &amp; We'll Send You this Cool Shirt New Relic is the only SaaS-based application performance monitoring service that delivers powerful full stack analytics. Optimize and monitor your browser, app, &amp; servers with just a few lines of code. Try New Relic and get this awesome Nerd Life shirt! http://p.sf.net/sfu/newrelic_d2d_may_______________________________________________ Please read the OpenNMS Mailing List FAQ: http://www.opennms.org/wiki/index.php?page=MailingListFaq opennms-cvs mailing list To *unsubscribe* or change your subscription options, see the bottom of this page: https://lists.sourceforge.net/lists/listinfo/opennms-cvs</pre> Benjamin Reed 2013-05-23T14:48:40 [OpenNMS/opennms] a72a63: Work around JAXB/JDK7 issue http://bamboo.internal... http://permalink.gmane.org/gmane.network.opennms.cvs/29388 <pre> Branch: refs/heads/1.12 Home: https://github.com/OpenNMS/opennms Commit: a72a63caecf77a30f742fa2fd0567184dd945ddb https://github.com/OpenNMS/opennms/commit/a72a63caecf77a30f742fa2fd0567184dd945ddb Author: Benjamin Reed &lt;ranger&lt; at &gt;opennms.org&gt; Date: 2013-05-23 (Thu, 23 May 2013) Changed paths: M opennms-model/src/main/java/org/opennms/netmgt/model/OnmsAssetRecord.java Log Message: ----------- Work around JAXB/JDK7 issue http://bamboo.internal.opennms.com:8085/browse/OPENNMS-MASTER17-TEST-89 ------------------------------------------------------------------------------ Try New Relic Now &amp; We'll Send You this Cool Shirt New Relic is the only SaaS-based application performance monitoring service that delivers powerful full stack analytics. Optimize and monitor your browser, app, &amp; servers with just a few lines of code. Try New Relic and get this awesome Nerd Life shirt! http://p.sf.net/sfu/newrelic_d2d_may_______________________________________________ Please read the OpenNMS Mailing List FAQ: http://www.opennms.org/wiki/index.php?page=MailingListFaq opennms-cvs mailing list To *unsubscribe* or change your subscription options, see the bottom of this page: https://lists.sourceforge.net/lists/listinfo/opennms-cvs</pre> Benjamin Reed 2013-05-23T14:48:21 Search Engine Search the mailing list at Gmane query http://search.gmane.org/?group=$group=gmane.network.opennms.cvs