Merge remote-tracking branch 'origin/master'

2015-11-17 15:58:41 +08:00 · 2015-11-17 15:58:41 +08:00 · f7f8f44cb6
parent a5901261b4 b94d8e1c33
commit f7f8f44cb6
2 changed files with 3 additions and 1 deletions
--- a/skywalking-sdk-plugin/.gitignore
+++ b/skywalking-sdk-plugin/.gitignore
@ -1,2 +1,3 @@
 .idea/
-skywalking-sdk-plugin.iml
+skywalking-sdk-plugin.iml
+/bin/
--- a/skywalking-sdk-plugin/pom.xml
+++ b/skywalking-sdk-plugin/pom.xml
@ -8,6 +8,7 @@
  <modules>
    <module>../skywalking-api/skywalking-sdk-plugin</module>
    <module>spring-plugin</module>
+    <module>jdbc-plugin</module>
  </modules>
  <packaging>pom</packaging>