pengys5 7ac504b19c Merge commit 'c3259afae0e4a267397d91c6117737aa4b7a2e54' into feature/160 ... # Conflicts: # apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/conf/Config.java # apm-sniffer/apm-agent/pom.xml # apm-sniffer/apm-sdk-plugin/pom.xml		2017-05-16 16:17:57 +08:00
..
apm-logging-api	Change groupId and artifactId	2017-04-28 01:17:09 +08:00
apm-logging-log4j2	Change groupId and artifactId	2017-04-28 01:17:09 +08:00
apm-trace	add okhttp plugin(provide synchronous http calls )	2017-05-16 10:14:53 +08:00
apm-util	Add mechanism to disable any or all plugins (#191)	2017-05-09 23:29:21 +08:00
pom.xml	Change groupId and artifactId	2017-04-28 01:17:09 +08:00