Merge "Added license metadata to specify Apache-2.0"

diff --git a/jjb/qtip/qtip-validate-jobs.yml b/jjb/qtip/qtip-validate-jobs.yml
index cd77d0a..42240ed 100644 (file)
--- a/jjb/qtip/qtip-validate-jobs.yml
+++ b/jjb/qtip/qtip-validate-jobs.yml
@@ -85,10 +85,8 @@
 
     wrappers:
       - timeout:
-          elastic-percentage: 150
-          elastic-default-timeout: 30
+          timeout: 15
           abort: true
-          type: elastic
       - timestamps
 
     triggers:

diff --git a/utils/test/reporting/reporting/qtip/template/index-status-tmpl.html b/utils/test/reporting/reporting/qtip/template/index-status-tmpl.html
index da8424a..f55f781 100644 (file)
--- a/utils/test/reporting/reporting/qtip/template/index-status-tmpl.html
+++ b/utils/test/reporting/reporting/qtip/template/index-status-tmpl.html
@@ -66,9 +66,9 @@
                 <table class="table">
                     <tr>
                         <th width="25%">Pod/Scenario</th>
-                        <th width="25%">Trend</th>
-                        <th width="25%">Last 4 Iterations</th>
-                        <th width="25%">Last 10 Days</th>
+                        <th width="25%">Scoring Trend</th>
+                        <th width="25%">Avg. in Last 4 Runs</th>
+                        <th width="25%">Avg. in Last 10 Days</th>
                     </tr>
                         {% for scenario,result in prof_results.iteritems() -%}
                             <tr class="tr-ok">