 yunnysunny
|
39cce2e071
|
Merge remote-tracking branch 'upstream/master'
|
2012-09-21 21:04:24 +08:00 |
|
 温高铁
|
54090b5992
|
Merge pull request #154 from wenshao/master
StatFilter添加slowSqlMillis和logSlowSql的getter和setter
|
2012-09-20 23:40:21 -07:00 |
|
 wenshao
|
78751d169d
|
StatFilter add getter & setter for logSlowSql, slowSqlMillis
|
2012-09-21 14:38:05 +08:00 |
|
|
温高铁
|
60edee175c
|
Merge pull request #153 from wenshao/master
支持使用lock unfair模式
|
2012-09-19 18:01:32 -07:00 |
|
|
wenshao
|
3d5ea4cb3c
|
support lock unfair
|
2012-09-20 08:59:20 +08:00 |
|
|
yunnysunny
|
741b18e72f
|
修正了多个数据源时，只显示最后一个数据源信息的bug
|
2012-09-18 21:28:16 +08:00 |
|
|
yunnysunny
|
a79c70325a
|
将DruidPooledPreparedStatement类的sqlite bug改动回滚。
|
2012-09-16 21:51:21 +08:00 |
|
|
yunnysunny
|
3993377c61
|
DruidSqlDetailFrame类添加了标题栏提示
添加了DruidSqlDetailFrame类的javadoc注释
|
2012-09-16 10:42:50 +08:00 |
|
|
yunnysunny
|
a85d8faf4d
|
添加了显示sql语句详细信息的界面
|
2012-09-15 22:59:34 +08:00 |
|
|
yunnysunny
|
71ee73b098
|
修正了代码格式
|
2012-09-12 21:54:26 +08:00 |
|
|
yunnysunny
|
73f49d13f4
|
修正了使用sqlite的时候，出现ResultSet closed异常抛出的问题
|
2012-09-11 13:40:32 +08:00 |
|
|
yunnysunny
|
c42ed6ca8c
|
完善了jconsole相关的部分javadoc注释
|
2012-09-08 10:00:03 +08:00 |
|
|
yunnysunny
|
f2123801a8
|
1.修正了jconsole多个数据源显示的时候，只显示第一个数据源表格的bug。
2.修改了jconsole界面显示，将界面分为两部分。数据区和版权区。
3.给jconsole的sql语句显示区增加了分类表头。
|
2012-09-05 20:02:25 +08:00 |
|
|
温高铁
|
fd094442ed
|
Merge pull request #149 from shrekwang/master
修改了activeConnectionStackTrace无法显示的问题
|
2012-09-04 00:16:59 -07:00 |
|
 shrek.wang
|
456042c151
|
fixes activeConnectionStackTrace.html didn't show data issue
|
2012-09-04 15:04:16 +08:00 |
|
|
温高铁
|
68dc14dab2
|
Merge pull request #148 from wenshao/master
0.2.7
|
2012-09-03 22:48:46 -07:00 |
|
|
wenshao
|
2e84c8b200
|
0.2.7
|
2012-09-04 13:47:45 +08:00 |
|
|
wenshao
|
38383c3b9a
|
FileURL correct format is file:// not file:/
|
2012-09-04 08:46:24 +08:00 |
|
|
温高铁
|
2e08d43cf4
|
Merge pull request #145 from wenshao/master
0.2.7-SNAPSHOT
|
2012-09-03 17:44:06 -07:00 |
|
|
wenshao
|
bbc549ff2f
|
0.2.7-SNAPSHOT
|
2012-09-04 08:42:01 +08:00 |
|
|
温高铁
|
af4b67e3fc
|
Merge pull request #140 from wenshao/master
0.2.6
|
2012-09-01 23:43:32 -07:00 |
|
|
wenshao
|
853b3ac262
|
0.2.6
0.2.6
|
2012-09-02 14:42:15 +08:00 |
|
|
温高铁
|
eebfc6b142
|
Merge pull request #139 from zhanming/master
clean webWppStatSet at setUp method
|
2012-09-01 04:05:08 -07:00 |
|
 Zhanming Qi
|
19a210f69c
|
Merge branch 'master' of https://github.com/zhanming/druid.git
|
2012-09-01 19:02:00 +08:00 |
|
|
Zhanming Qi
|
aa8941a8a7
|
clean webWppStatSet at setUp
|
2012-09-01 18:59:40 +08:00 |
|
|
温高铁
|
8a7d21b008
|
Merge pull request #138 from zhanming/master
change resetAll to setUp, before every method, need resetAll.
|
2012-09-01 02:54:38 -07:00 |
|
|
Zhanming Qi
|
ec3bdaccff
|
Merge remote-tracking branch 'upstream/master'
|
2012-09-01 16:14:41 +08:00 |
|
|
Zhanming Qi
|
6fc2dd8bc2
|
add multiple data source test case.
|
2012-09-01 16:10:54 +08:00 |
|
|
Zhanming Qi
|
1e33fad5b0
|
change resetAll to setUp, before every method, need resetAll.
|
2012-09-01 16:10:23 +08:00 |
|
|
温高铁
|
f3c0f3d749
|
Merge pull request #137 from wenshao/master
重构ConfigFilter
|
2012-08-31 21:00:45 -07:00 |
|
|
wenshao
|
864a883c2c
|
refactor ConfigFilter
|
2012-09-01 11:58:38 +08:00 |
|
|
温高铁
|
ab61ef339d
|
Merge pull request #136 from zhanming/master
add test case for DruidStatService, remove useless jetty config file.
|
2012-08-31 19:50:33 -07:00 |
|
|
Zhanming Qi
|
0c134ab6e0
|
remove jetty config
|
2012-09-01 10:41:33 +08:00 |
|
|
Zhanming Qi
|
42e24680d2
|
add test case for DruidStatService
|
2012-09-01 10:41:13 +08:00 |
|
|
wenshao
|
7a77a70fbe
|
fixed test
|
2012-09-01 09:11:32 +08:00 |
|
|
温高铁
|
70d07acbd8
|
Merge pull request #135 from wenshao/master
重构ConfigFilter
|
2012-08-31 18:03:37 -07:00 |
|
|
wenshao
|
6a99fe1c6e
|
refactor ConfigFilter
|
2012-09-01 09:02:10 +08:00 |
|
|
wenshao
|
eaf0ccb80b
|
refactor ConfigFilter
|
2012-09-01 09:01:59 +08:00 |
|
|
wenshao
|
b0a519e44f
|
refactor ConfigFilter
|
2012-09-01 07:51:29 +08:00 |
|
|
wenshao
|
f7be377c79
|
refactor ConfigFilter, remove ConfigLoader
|
2012-08-31 22:14:40 +08:00 |
|
|
wenshao
|
f9279bac88
|
refactor ConfigFilter, remove ConfigLoader
|
2012-08-31 22:09:25 +08:00 |
|
|
温高铁
|
f10b040a69
|
Merge pull request #134 from wenshao/master
重构ConfigFilter相关的testcase
|
2012-08-31 06:52:23 -07:00 |
|
|
wenshao
|
b2e42115df
|
refactor testcase
|
2012-08-31 21:49:41 +08:00 |
|
|
wenshao
|
fd440a2fcf
|
Merge remote-tracking branch 'upstream/master'
|
2012-08-31 21:43:39 +08:00 |
|
|
wenshao
|
1201a525d1
|
revmoe failed testcase
|
2012-08-31 21:40:20 +08:00 |
|
|
温高铁
|
7244c3a1d6
|
Merge pull request #133 from wenshao/master
删除跑不过的testcase
|
2012-08-31 06:39:13 -07:00 |
|
|
wenshao
|
d8a4c8fdfc
|
revmoe failed testcase
|
2012-08-31 21:38:14 +08:00 |
|
|
温高铁
|
e274009585
|
Merge pull request #132 from wenshao/master
add license info
|
2012-08-31 06:16:25 -07:00 |
|
|
wenshao
|
d9084ef164
|
add license
|
2012-08-31 21:15:20 +08:00 |
|
|
温高铁
|
8641079f57
|
Merge pull request #131 from xiaoyu830411/master
加解密和加载远程文件
|
2012-08-31 04:57:24 -07:00 |
|