wusheng 01a08caea3 Merge branch 'feature/collector' into feature/3.0 ... * feature/collector: compile error refactor the way how to create worker instance refactor cluster module, modify the way use to tell cluster worker add recevier moudle # Conflicts: # skywalking-collector/pom.xml # skywalking-collector/skywalking-collector-cluster/pom.xml # skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/actor/AbstractMember.java # skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/actor/AbstractWorker.java # skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/actor/AbstractWorkerProvider.java # skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/actor/WorkerRef.java # skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/actor/WorkersCreator.java # skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/cluster/WorkersListener.java # skywalking-collector/skywalking-collector-worker/pom.xml # skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/CollectorBootStartUp.java		2017-03-17 16:16:04 +08:00
..
skywalking-logging-api	Recover logging-api/logging-log4j2 modules. Adjust codes for new modules.	2017-03-13 15:57:51 +08:00
skywalking-logging-log4j2	Recover logging-api/logging-log4j2 modules. Adjust codes for new modules.	2017-03-13 15:57:51 +08:00
skywalking-trace	Merge branch 'feature/collector' into feature/3.0	2017-03-17 16:16:04 +08:00
skywalking-util	Alter TraceSegement, Add a list of DistributedTraceId as field `relatedGlobalTraces`.	2017-03-16 16:30:11 +08:00
pom.xml	Recover logging-api/logging-log4j2 modules. Adjust codes for new modules.	2017-03-13 15:57:51 +08:00