wusheng 7ecbb8677f Merge branch 'master' into feature/3.0.1 ... * master: fix collector cannot start issue Fix ci-fail. Add “checkStyle.xml” and “codeStyle.xml” files, varify the code-style when “mvn compile” and CI. This is the initialized commit. Update LICENSE Update LICENSE # Conflicts: # skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/config/EsConfig.java		2017-04-20 13:00:58 +08:00
..
src	Merge branch 'master' into feature/3.0.1	2017-04-20 13:00:58 +08:00
pom.xml	Set version = 3.0.1.	2017-04-13 21:19:07 +08:00