Merge remote-tracking branch 'zhb/master'

Conflicts:
	src/main/java/com/alibaba/druid/support/http/StatViewServlet.java
This commit is contained in:
zhouhaibin
2012-08-10 15:08:51 +08:00
parent a6efc3776b
commit 48befaf00d
+1 -1
View File
@@ -4,7 +4,7 @@
<groupId>com.alibaba</groupId>
<artifactId>druid</artifactId>
<version>0.2.7-SNAPSHOT</version>
<version>0.2.6-SNAPSHOT</version>
<packaging>jar</packaging>
<name>druid</name>