Return-Path: 
 <commits-return-1723-apmail-aurora-commits-archive=aurora.apache.org@aurora.incubator.apache.org>
X-Original-To: apmail-aurora-commits-archive@minotaur.apache.org
Delivered-To: apmail-aurora-commits-archive@minotaur.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 2E4871792B
	for <apmail-aurora-commits-archive@minotaur.apache.org>;
 Fri, 13 Mar 2015 17:56:30 +0000 (UTC)
Received: (qmail 17767 invoked by uid 500); 13 Mar 2015 17:56:30 -0000
Delivered-To: apmail-aurora-commits-archive@aurora.apache.org
Received: (qmail 17734 invoked by uid 500); 13 Mar 2015 17:56:30 -0000
Mailing-List: contact commits-help@aurora.incubator.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@aurora.incubator.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@aurora.incubator.apache.org>
List-Post: <mailto:commits@aurora.incubator.apache.org>
List-Id: <commits.aurora.incubator.apache.org>
Reply-To: dev@aurora.incubator.apache.org
Delivered-To: mailing list commits@aurora.incubator.apache.org
Received: (qmail 17725 invoked by uid 99); 13 Mar 2015 17:56:30 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 13 Mar 2015 17:56:30 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED,T_RP_MATCHES_RCVD
X-Spam-Check-By: apache.org
Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with SMTP; Fri, 13 Mar 2015 17:56:28 +0000
Received: (qmail 17651 invoked by uid 99); 13 Mar 2015 17:56:08 -0000
Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org)
 (140.211.11.23)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 13 Mar 2015 17:56:08 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at
 git1-us-west.apache.org, from userid 33)
	id 99EE8E17BF; Fri, 13 Mar 2015 17:56:08 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: wfarner@apache.org
To: commits@aurora.incubator.apache.org
Message-Id: <e3d43a51f4ec4ce2abb78192d6dbae57@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: incubator-aurora git commit: Show update status change messages in
 the scheduler UI.
Date: Fri, 13 Mar 2015 17:56:08 +0000 (UTC)
X-Virus-Checked: Checked by ClamAV on apache.org

Repository: incubator-aurora
Updated Branches:
  refs/heads/master 93c338dc7 -> 128e5540e


Show update status change messages in the scheduler UI.

Bugs closed: AURORA-1077

Reviewed at https://reviews.apache.org/r/32050/


Project: http://git-wip-us.apache.org/repos/asf/incubator-aurora/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-aurora/commit/128e5540
Tree: http://git-wip-us.apache.org/repos/asf/incubator-aurora/tree/128e5540
Diff: http://git-wip-us.apache.org/repos/asf/incubator-aurora/diff/128e5540

Branch: refs/heads/master
Commit: 128e5540ec3e5b2e54862990d9f9d0cc947f83fe
Parents: 93c338d
Author: Bill Farner <wfarner@apache.org>
Authored: Fri Mar 13 10:55:29 2015 -0700
Committer: Bill Farner <wfarner@apache.org>
Committed: Fri Mar 13 10:55:29 2015 -0700

----------------------------------------------------------------------
 src/main/resources/scheduler/assets/update.html      | 4 +++-
 src/test/sh/org/apache/aurora/e2e/test_end_to_end.sh | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/128e5540/src/main/resources/scheduler/assets/update.html
----------------------------------------------------------------------
diff --git a/src/main/resources/scheduler/assets/update.html b/src/main/resources/scheduler/assets/update.html
index 2ce13b4..e95053f 100644
--- a/src/main/resources/scheduler/assets/update.html
+++ b/src/main/resources/scheduler/assets/update.html
@@ -88,11 +88,13 @@
               <th>event</th>
               <th>time</th>
               <th>user</th>
+              <th>message</th>
             </tr>
             <tr ng-repeat="e in update.updateEvents">
               <td>{{e.status | toNiceStatus}}</td>
               <td>{{e.timestampMs | toElapsedTime }} ago</td>
               <td>{{e.user}}</td>
+              <td>{{e.message}}</td>
             </tr>
           </table>
         </div>
@@ -127,4 +129,4 @@
     </div>
 
   </div>
-</div>
\ No newline at end of file
+</div>

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/128e5540/src/test/sh/org/apache/aurora/e2e/test_end_to_end.sh
----------------------------------------------------------------------
diff --git a/src/test/sh/org/apache/aurora/e2e/test_end_to_end.sh b/src/test/sh/org/apache/aurora/e2e/test_end_to_end.sh
index 5cff81f..f255f2d 100755
--- a/src/test/sh/org/apache/aurora/e2e/test_end_to_end.sh
+++ b/src/test/sh/org/apache/aurora/e2e/test_end_to_end.sh
@@ -172,7 +172,7 @@ test_update() {
   assert_update_state $_jobkey 'ROLLING_FORWARD'
   sudo restart aurora-scheduler
   assert_update_state $_jobkey 'ROLLING_FORWARD'
-  aurora beta-update pause $_jobkey
+  aurora beta-update pause $_jobkey --message='hello'
   assert_update_state $_jobkey 'ROLL_FORWARD_PAUSED'
   aurora beta-update resume $_jobkey
   assert_update_state $_jobkey 'ROLLING_FORWARD'