commit 96bbf31065b3d7a27816c9344002803619d9e3fc
author Iftekharul Islam <iffy.ryan@ibm.com> Tue Aug 22 13:44:38 2017 -0500
committer Adriana Kobylak <anoo@us.ibm.com> Mon Oct 09 14:13:43 2017 -0500
tree 799b12ed7590c0fe0328ac37aceab45332759617
parent ba556c310594af3daa22bc96abee55af9ce23ab2

Updated master after merge conflicts

Change-Id: Ibea933c20071cc85201420ba1e31fedf9356f55b
Signed-off-by: Iftekharul Islam <iffy.ryan@ibm.com>

app/server-health/index.js

diff --git a/app/server-health/index.js b/app/server-health/index.js
index 3c32065..1d4ff9f 100644
--- a/app/server-health/index.js
+++ b/app/server-health/index.js
@@ -28,6 +28,11 @@
                     'controller': 'logController',
                     authenticated: true
                 })
+                .when('/server-health/event-log/:type/:id', {
+                    'templateUrl': 'server-health/controllers/log-controller.html',
+                    'controller': 'logController',
+                    authenticated: true
+                })
                 .when('/server-health/inventory-overview', {
                     'templateUrl': 'server-health/controllers/inventory-overview-controller.html',
                     'controller': 'inventoryOverviewController',