skywalking-java/apm-collector
wusheng b3c39aea53 Merge branch 'master' into feature/high-performance-agent
* master:
  add test case and fix logical error
  Fix windows script start collector failure.
  fix skywalking container start failure
  fix  lost tags
  Add mechanism to set default status(on/off) of plugin
  Add layer tag value: mq.

# Conflicts:
#	apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/trace/Span.java
2017-06-28 09:07:06 +08:00
..
apm-collector-cluster Update version for next iteration. 2017-06-17 22:40:42 +08:00
apm-collector-commons Update version for next iteration. 2017-06-17 22:40:42 +08:00
apm-collector-worker Merge branch 'master' into feature/high-performance-agent 2017-06-28 09:07:06 +08:00
pom.xml Update version for next iteration. 2017-06-17 22:40:42 +08:00