# 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

add test case for okhttp interceptor

* add plugins for resin-3.x and resin-4.x 

* Add mechanism to disable any or all plugins, Relate: #186

Support multi plugins for one target class

Rename the "apm-api" module to "apm-agent-core”. 

Update contributing guide.

fix functional issues after update new package name

2. Some class check style error.

chore(project): add the .gitignore file to project

Redis plugin cannot work on tomcat

Prepare for release 3.0.1

* feature/159:
  no message
  no message
  no message
  no message
  no message
  no message
  no message
  Add log4j.xml into test package

modify the expose port of collector image