[ARVADOS] updated: 1af3397c28837ff61d3538e14b7358281b38097a

[git at public.curoverse.com]

Summary of changes:
 apps/workbench/app/assets/javascripts/event_log.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

       via  1af3397c28837ff61d3538e14b7358281b38097a (commit)
      from  7ab6b64c5fa3b958752ecb22751630b6e1016bd1 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 1af3397c28837ff61d3538e14b7358281b38097a
Author: Phil Hodgson <bitbucket at philhodgson.net>
Date:   Wed Nov 26 20:04:07 2014 +0100

    4233: adjustment to previous commit, round numbers before comparing - stay loose

diff --git a/apps/workbench/app/assets/javascripts/event_log.js b/apps/workbench/app/assets/javascripts/event_log.js
index e2ec249..29ea74c 100644
--- a/apps/workbench/app/assets/javascripts/event_log.js
+++ b/apps/workbench/app/assets/javascripts/event_log.js
@@ -103,7 +103,7 @@ function processLogLineForChart( logLine ) {
                 // special calculation for cpus
                 if( /-cpu$/.test(series) ) {
                     // divide the stat by the number of cpus unless the time count is less than the interval length
-                    if( dsum > dt ) {
+                    if( dsum.toFixed(1) > dt.toFixed(1) ) {
                         var cpuCountMatch = intervalMatch[1].match(/(\d+) cpus/);
                         if( cpuCountMatch ) {
                             datum = datum / cpuCountMatch[1];
@@ -267,7 +267,7 @@ function createJobGraph(elementName) {
                 var datum = options.data[index][series];
                 var point = ''
                 point += "<div class='morris-hover-point' style='color: ";
-                point += options.lineColors[sortedIndex];
+                point += options.lineColors[sortedIndex % options.lineColors.length];
                 point += "'>";
                 var labelMatch = options.labels[sortedIndex].match(/^T(\d+)-(.*)/);
                 point += 'Task ' + labelMatch[1] + ' ' + labelMatch[2];

-----------------------------------------------------------------------


hooks/post-receive
--