Merge branch 'master' of https://github.com/linkedin/dr-elephant into…

… AggregatedMetrics
utf7 · Jun 7, 2016 · 29da70b · 29da70b
2 parents 8d92f98 + 5470899
commit 29da70b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -16,6 +16,8 @@ Administrator guide: [Click here](https://github.com/linkedin/dr-elephant/wiki/A
 
 Google groups mailing list: [Click here](https://groups.google.com/forum/#!forum/dr-elephant-users)
 
+Engineering Blog: [Click here](https://engineering.linkedin.com/blog/2016/04/dr-elephant-open-source-self-serve-performance-tuning-hadoop-spark)
+
 ## License
 
     Copyright 2016 LinkedIn Corp.

diff --git a/app/controllers/Application.java b/app/controllers/Application.java
@@ -120,7 +120,7 @@ public class Application extends Controller {
    */
   public static Result dashboard() {
     long now = System.currentTimeMillis();
-    Date finishDate = new Date(now - DAY);
+    long finishDate = now - DAY;
 
     // Update statistics only after FETCH_DELAY
     if (now - _lastFetch > FETCH_DELAY) {

diff --git a/jacoco.sbt b/jacoco.sbt
@@ -23,6 +23,6 @@ parallelExecution      in jacoco.Config := false
 
 jacoco.outputDirectory in jacoco.Config := file("target/jacoco")
 
-jacoco.reportFormats   in jacoco.Config := Seq(HTMLReport("utf-8"))
+jacoco.reportFormats   in jacoco.Config := Seq(XMLReport(encoding = "utf-8"), HTMLReport("utf-8"))
 
 jacoco.excludes        in jacoco.Config := Seq("views*", "*Routes*", "controllers*routes*", "controllers*Reverse*", "controllers*javascript*", "controller*ref*")