Alawn/Druid
1
0
Fork 0
mirror of https://github.com/alibaba/druid.git synced 2023-03-04 19:17:16 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' of https://wenshao@github.com/AlibabaTech/druid.git

Browse Source 
Conflicts:
	src/main/java/com/alibaba/druid/filter/wall/WallConfig.java
	src/test/resources/com/alibaba/druid/pool/spring-config-1.xml
This commit is contained in:
温少
2012-03-17 14:21:28 +08:00
parent e46ded89b8 12a485e921
commit 2254bcfeb5
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/test/resources/com/alibaba/druid/pool/spring-config-1.xml
+1 -1
View File
@@ -42,4 +42,4 @@ http://www.springframework.org/schema/aop http://www.springframework.org/schema/
</property>
</bean>
</beans>
</beans>