Merge branch 'master' into develop

zkkxyz · May 28, 2013 · 02f3023 · 02f3023
2 parents 1765566 + 3b96d0f
commit 02f3023
Show file tree

Hide file tree

Showing 45 changed files with 36 additions and 1,180 deletions.
diff --git a/docs/Hydra架构介绍.docx b/docs/Hydra架构介绍.docx
diff --git a/...hydra-collector-service/src/main/java/com/jd/bdp/hydra/collector/service/CSBootstrap.java b/...hydra-collector-service/src/main/java/com/jd/bdp/hydra/collector/service/CSBootstrap.java
@@ -4,7 +4,6 @@
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
 /**
- * User: yfliuyu
  * Date: 13-4-16
  * Time: 上午11:01
  */

diff --git a/...llector-service/src/main/java/com/jd/bdp/hydra/collector/service/CollectorSerService.java b/...llector-service/src/main/java/com/jd/bdp/hydra/collector/service/CollectorSerService.java
@@ -16,7 +16,6 @@
 import java.util.concurrent.Executors;
 
 /**
- * User: yfliuyu
  * Date: 13-4-17
  * Time: 下午5:03
  */

diff --git a/modules/hydra-collector/src/main/java/com/jd/bdp/hydra/dubbomonitor/HydraDubbeConfig.java b/modules/hydra-collector/src/main/java/com/jd/bdp/hydra/dubbomonitor/HydraDubbeConfig.java
@@ -7,7 +7,6 @@
 import java.util.Properties;
 
 /**
- * User: shell0dh
  * Date: 13-3-19
  * Time: 上午9:43
  */

diff --git a/modules/hydra-collector/src/main/java/com/jd/bdp/hydra/dubbomonitor/LogEvent.java b/modules/hydra-collector/src/main/java/com/jd/bdp/hydra/dubbomonitor/LogEvent.java
diff --git a/modules/hydra-interface/src/main/java/com/jd/bdp/hydra/Annotation.java b/modules/hydra-interface/src/main/java/com/jd/bdp/hydra/Annotation.java
@@ -3,7 +3,6 @@
 import java.io.Serializable;
 
 /**
- * User: yfliuyu
  * Date: 13-3-18
  * Time: 下午3:36
  */

diff --git a/modules/hydra-interface/src/main/java/com/jd/bdp/hydra/BinaryAnnotation.java b/modules/hydra-interface/src/main/java/com/jd/bdp/hydra/BinaryAnnotation.java
@@ -1,10 +1,8 @@
 package com.jd.bdp.hydra;
 
 import java.io.Serializable;
-import java.util.Arrays;
 
 /**
- * User: yfliuyu
  * Date: 13-3-18
  * Time: 下午3:36
  */

diff --git a/modules/hydra-interface/src/main/java/com/jd/bdp/hydra/Endpoint.java b/modules/hydra-interface/src/main/java/com/jd/bdp/hydra/Endpoint.java
@@ -3,7 +3,6 @@
 import java.io.Serializable;
 
 /**
- * User: yfliuyu
  * Date: 13-3-18
  * Time: 下午3:36
  */

diff --git a/...hydra-store/hydra-hbase/src/main/java/com/jd/bdp/hydra/hbase/service/impl/HbaseUtils.java b/...hydra-store/hydra-hbase/src/main/java/com/jd/bdp/hydra/hbase/service/impl/HbaseUtils.java
@@ -26,8 +26,7 @@
 import java.util.List;
 
 /**
- * Created with IntelliJ IDEA.
- * User: yfliuyu
+
  * Date: 13-4-12
  * Time: 下午4:19
  */

diff --git a/modules/hydra-test/hydra-test-modules/README.md b/modules/hydra-test/hydra-test-modules/README.md
diff --git a/modules/hydra-test/hydra-test-modules/pom.xml b/modules/hydra-test/hydra-test-modules/pom.xml
diff --git a/modules/hydra-test/hydra-test-modules/src/main/java/com/jd/bdp/mock/TestMock.java b/modules/hydra-test/hydra-test-modules/src/main/java/com/jd/bdp/mock/TestMock.java
diff --git a/...-test/hydra-test-modules/src/main/java/com/jd/bdp/registry/client/TestRegistryClient.java b/...-test/hydra-test-modules/src/main/java/com/jd/bdp/registry/client/TestRegistryClient.java
diff --git a/...ra-test-modules/src/main/java/com/jd/bdp/registry/client/support/LeaderClientService.java b/...ra-test-modules/src/main/java/com/jd/bdp/registry/client/support/LeaderClientService.java
diff --git a/modules/hydra-test/hydra-test-modules/src/main/java/com/jd/bdp/sending/StartHydra.java b/modules/hydra-test/hydra-test-modules/src/main/java/com/jd/bdp/sending/StartHydra.java
diff --git a/modules/hydra-test/hydra-test-modules/src/main/java/com/jd/bdp/sending/StartRegister.java b/modules/hydra-test/hydra-test-modules/src/main/java/com/jd/bdp/sending/StartRegister.java