Merge branch 'master' of ssh://192.168.8.22:58422/cat

cat-home/src/main/webapp/jsp/report/health.jsp

@@ -13,8 +13,6 @@
 	<res:useCss value="${res.css.local.health_css}" target="head-css" />
 <br>
 
-
-<h2 style="text-align:center">健康指数：***</h2>
 <div style="float: left;width:100%">
 	<div style="width: 33%; float: left;">
 				<table class="health">

cat-home/src/main/webapp/jsp/report/healthHistory.jsp

@@ -15,7 +15,6 @@
 	<res:useJs value="${res.js.local.flotr2_js}" target="head-js" />
 	<res:useJs value="${res.js.local.trendGraph_js}" target="head-js" />
 <br>
-<h2 style="text-algin:center;">健康指数：***</h2>
 <div style="float: left;width:100%">
 	<div style="width: 33%; float: left;">
 				<table class="health">

cat-home/src/test/java/com/dianping/cat/report/task/TaskConsumerTest.java

@@ -344,14 +344,16 @@ public class TaskConsumerTest {
 		latch.countDown();
 		new Thread(consumerTwo).start();
 		latch.countDown();
+		Thread.sleep(500);
 		while (!consumerOne.isStopped()) {
-			Thread.sleep(10);
+			Thread.sleep(500);
 		}
 
 		while (!consumerTwo.isStopped()) {
-			Thread.sleep(1500);
+			Thread.sleep(500);
 		}
 
+
 		Assert.assertEquals("[1, 8, 7, 10, 3, 1, 8, 4]", Arrays.toString(consumerOne.replayer.toArray()));
 
 		String consumerTwoResult = Arrays.toString(consumerTwo.replayer.toArray());