Merge branch 'master' into develop

zkkxyz · May 29, 2013 · 6dbacb3 · 6dbacb3
2 parents 10f2d7e + a015270
commit 6dbacb3
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/modules/hydra-test/README.md b/modules/hydra-test/README.md
@@ -56,27 +56,27 @@ Hydra 测试
     <tr>
         <td>C1-exp2</td>
         <td>192.168.200.112</td>
-        <td>C</td>
+        <td>C1</td>
     </tr>
     <tr>
         <td>C2-exp2</td>
         <td>192.168.200.112</td>
-        <td>C</td>
+        <td>C2</td>
     </tr>
     <tr>
         <td>E-exp2</td>
         <td>192.168.200.113</td>
-        <td>C</td>
+        <td>E</td>
     </tr>
     <tr>
         <td>D1-exp2</td>
         <td>192.168.200.113</td>
-        <td>C</td>
+        <td>D1</td>
     </tr>
     <tr>
         <td>D2-exp2</td>
         <td>192.168.200.113</td>
-        <td>C</td>
+        <td>D2</td>
     </tr>
 
 
@@ -86,4 +86,4 @@ Hydra 测试
 
 ### 接口测试
         对跟踪数据存储接口的性能测试，针对hydra-store-interface的测试（Mysql环境下)
-        依赖于JMeter工具
+        依赖于JMeter工具