From 48befaf00dc17de2e69089a63f3401922806fb0f Mon Sep 17 00:00:00 2001 From: zhouhaibin <283595276@qq.com> Date: Fri, 10 Aug 2012 15:08:51 +0800 Subject: [PATCH 1/2] Merge remote-tracking branch 'zhb/master' Conflicts: src/main/java/com/alibaba/druid/support/http/StatViewServlet.java --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 696465cc14..e8cfe02253 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.alibaba druid - 0.2.7-SNAPSHOT + 0.2.6-SNAPSHOT jar druid From 5cf58ff2b710f7379454d135815ccc7fc08db512 Mon Sep 17 00:00:00 2001 From: zhouhaibin <283595276@qq.com> Date: Fri, 10 Aug 2012 15:30:35 +0800 Subject: [PATCH 2/2] Merge remote-tracking branch 'zhb/master' Conflicts: src/main/java/com/alibaba/druid/support/http/StatViewServlet.java --- .../java/com/alibaba/druid/support/http/StatViewServlet.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/alibaba/druid/support/http/StatViewServlet.java b/src/main/java/com/alibaba/druid/support/http/StatViewServlet.java index addaba62f1..df9fb7b460 100644 --- a/src/main/java/com/alibaba/druid/support/http/StatViewServlet.java +++ b/src/main/java/com/alibaba/druid/support/http/StatViewServlet.java @@ -130,7 +130,7 @@ public class StatViewServlet extends HttpServlet { content.append("

LastSlow SQL View:

"); content.append(""); content.append(""); - content.append(""); + content.append(""); content.append(""); content.append(""); content.append("");
MaxTimespanOccurTimeSlowestSqlOccurTime" + format.format(sqlStat.get("MaxTimespanOccurTime")) + "