From 5f742c216352b176ffe5c92e86ad7976c3e01a17 Mon Sep 17 00:00:00 2001
From: Ben Yanke <ben@benyanke.com>
Date: Wed, 31 Jan 2018 12:09:10 -0600
Subject: [PATCH 1/2] feat(container-details): fix typo in container status

---
 app/components/container/container.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/components/container/container.html b/app/components/container/container.html
index 08843a9f7..15b94b8b7 100644
--- a/app/components/container/container.html
+++ b/app/components/container/container.html
@@ -66,7 +66,7 @@
                 <td>
                   <i class="fa fa-heartbeat space-right green-icon" ng-if="container.State.Running"></i>
                   <i class="fa fa-heartbeat space-right red-icon" ng-if="!container.State.Running && container.State.Status !== 'created'"></i>
-                  {{ container.State|getstatetext }} since {{ activityTime }}<span ng-if="!container.State.Running && container.State.Status !== 'created'"> with exit code {{ container.State.ExitCode }}</span>
+                  {{ container.State|getstatetext }} for {{ activityTime }}<span ng-if="!container.State.Running && container.State.Status !== 'created'"> with exit code {{ container.State.ExitCode }}</span>
                 </td>
               </tr>
               <tr>

From 56cab429def72632da0a80fe162d33de3a7a738c Mon Sep 17 00:00:00 2001
From: Anthony Lapenna <lapenna.anthony@gmail.com>
Date: Wed, 31 Jan 2018 19:11:20 +0100
Subject: [PATCH 2/2] Revert "feat(container-details): fix typo in container
 status" (#1619)

This reverts commit 5f742c216352b176ffe5c92e86ad7976c3e01a17.
---
 app/components/container/container.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/components/container/container.html b/app/components/container/container.html
index 15b94b8b7..08843a9f7 100644
--- a/app/components/container/container.html
+++ b/app/components/container/container.html
@@ -66,7 +66,7 @@
                 <td>
                   <i class="fa fa-heartbeat space-right green-icon" ng-if="container.State.Running"></i>
                   <i class="fa fa-heartbeat space-right red-icon" ng-if="!container.State.Running && container.State.Status !== 'created'"></i>
-                  {{ container.State|getstatetext }} for {{ activityTime }}<span ng-if="!container.State.Running && container.State.Status !== 'created'"> with exit code {{ container.State.ExitCode }}</span>
+                  {{ container.State|getstatetext }} since {{ activityTime }}<span ng-if="!container.State.Running && container.State.Status !== 'created'"> with exit code {{ container.State.ExitCode }}</span>
                 </td>
               </tr>
               <tr>