Merge remote-tracking branch 'origin/1.12' into develop

Conflicts: core/snmp/impl-mock/src/main/java/org/opennms/netmgt/snmp/mock/MockSnmpStrategy.java core/snmp/impl-mock/src/main/java/org/opennms/netmgt/snmp/mock/MockSnmpValue.java core/snmp/impl-mock/src/main/java/org/opennms/netmgt/snmp/mock/MockSnmpValueFactory.java core/snmp/impl-mock/src/main/java/org/opennms/netmgt/snmp/mock/MockSnmpWalker.java core/snmp/impl-mock/src/main/java/org/opennms/netmgt/snmp/mock/PropertyOidContainer.java core/test-api/snmp/src/main/java/org/opennms/core/test/snmp/JUnitSnmpAgentExecutionListener.java core/test-api/snmp/src/main/java/org/opennms/core/test/snmp/ProxySnmpAgentConfigFactory.java opennms-services/src/test/java/org/opennms/netmgt/linkd/LinkdNms10205aOspfTest.java opennms-services/src/test/java/org/opennms/netmgt/linkd/LinkdNms10205aTest.java
OpenNMS · Sep 17, 2014 · 0926653 · 0926653
2 parents 0cef344 + 68d4136
commit 0926653
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/...main/java/org/opennms/netmgt/provision/service/vmware/VmwareRequisitionUrlConnection.java b/...main/java/org/opennms/netmgt/provision/service/vmware/VmwareRequisitionUrlConnection.java
@@ -708,7 +708,7 @@ private void iterateHostSystems(VmwareViJavaAccess vmwareViJavaAccess, int apiVe
 
                     // add memory
                     try {
-                        node.putAsset(new RequisitionAsset("memory", Math.round(hostSystem.getHardware().getMemorySize()/1000000f) + " MB"));
+                        node.putAsset(new RequisitionAsset("ram", Math.round(hostSystem.getHardware().getMemorySize()/1000000f) + " MB"));
                     } catch (Exception e) {
                         logger.debug("Can't find Memory information for {} (ID: {})", hostSystem.getName(), hostSystem.getMOR().getVal());
                     }
@@ -774,7 +774,7 @@ private void iterateVirtualMachines(VmwareViJavaAccess vmwareViJavaAccess, int a
 
                     // add memory
                     try {
-                        node.putAsset(new RequisitionAsset("memory", virtualMachine.getConfig().getHardware().getMemoryMB() + " MB"));
+                        node.putAsset(new RequisitionAsset("ram", virtualMachine.getConfig().getHardware().getMemoryMB() + " MB"));
                     } catch (Exception e) {
                         logger.debug("Can't find Memory information for {} (ID: {})", virtualMachine.getName(), virtualMachine.getMOR().getVal());
                     }

diff --git a/opennms-webapp/src/main/webapp/images/powered_by_jetty.gif b/opennms-webapp/src/main/webapp/images/powered_by_jetty.gif
diff --git a/opennms-webapp/src/main/webapp/support/about.jsp b/opennms-webapp/src/main/webapp/support/about.jsp
@@ -177,8 +177,8 @@
       	   <td style="border-right: none;">
 		<p align="center">
         	Powered By Jetty<br/>
-		<a href="http://jetty.mortbay.org" target="_new"><img src="images/powered_by_jetty.gif" hspace="0" vspace="0"
-      		   border="0" alt="jetty.mortbay.org" align="center"></a>.
+		<a href="http://www.eclipse.org/jetty/" target="_new"><img src="images/powered_by_jetty.gif" hspace="0" vspace="0"
+      		   border="0" alt="eclipse.org/jetty/" align="center"></a>.
       		</p>
 	   </td>
            <td style="border-left: none; border-right: none;">