Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/foundation' into develop
Browse files Browse the repository at this point in the history
Conflicts:
	opennms-webapp/src/main/webapp/pathOutage/index.jsp
  • Loading branch information
agalue committed Mar 26, 2015
2 parents e69cce9 + c029760 commit 6a438a3
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion opennms-webapp/src/main/webapp/pathOutage/index.jsp
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
<td><a href="element/node.jsp?node=<%= pthData[1] %>"><%= pthData[0] %></a></td>
<% } %>
<td><%= pth[1] %></td>
<td class="<%= pthData[3] %>"><%= pth[2] %></td>
<td class="severity-<%= pthData[3] %> bright"><%= pth[2] %></td>
<td><a
href="pathOutage/showNodes.jsp?critIp=<%= pth[1] %>&critSvc=<%= pth[2] %>"><%= pthData[2] %></a></td>
</tr>
Expand Down

0 comments on commit 6a438a3

Please sign in to comment.