 wenshao
|
f96e3657ca
|
Merge remote-tracking branch 'upstream/master'
|
2012-08-27 15:52:27 +08:00 |
|
 温高铁
|
f029b3aabb
|
Merge pull request #92 from shrekwang/master
命令行工具改进
|
2012-08-27 00:51:28 -07:00 |
|
 shrek.wang
|
980278137c
|
Merge branch 'master' of git://github.com/AlibabaTech/druid
|
2012-08-27 15:45:11 +08:00 |
|
|
shrek.wang
|
c8aae5b331
|
add '-id' argument, improve print result in cmd tool
|
2012-08-27 15:41:14 +08:00 |
|
|
shrek.wang
|
4404018dcb
|
add contributor name in common.js
|
2012-08-27 15:39:38 +08:00 |
|
|
wenshao
|
35cb2f42ba
|
format code
|
2012-08-27 15:29:28 +08:00 |
|
|
温高铁
|
4e872f616e
|
Merge pull request #91 from wenshao/master
缩小锁范围
|
2012-08-27 00:18:25 -07:00 |
|
|
wenshao
|
7365023944
|
缩小锁范围
|
2012-08-27 15:15:33 +08:00 |
|
|
温高铁
|
0f8be755c8
|
Merge pull request #90 from wenshao/master
DruidDataSource初始化检查是去掉无用的maxIdle检测
|
2012-08-26 22:49:33 -07:00 |
|
|
wenshao
|
14c1d27c71
|
DruidDataSource.init remove maxIdle check
|
2012-08-27 13:46:42 +08:00 |
|
|
温高铁
|
5eb6db7a84
|
Merge pull request #89 from wenshao/master
增强index.html，添加JVM相关信息
|
2012-08-26 22:22:54 -07:00 |
|
|
wenshao
|
5067c28269
|
improve index.html, add jvm info
|
2012-08-27 13:21:31 +08:00 |
|
|
温高铁
|
bf62c205c5
|
Merge pull request #87 from libinsong/master
修改个人主页地址和项目地址
|
2012-08-26 19:43:01 -07:00 |
|
 melin
|
238aac44eb
|
添加druid项目地址
|
2012-08-27 10:38:00 +08:00 |
|
|
melin
|
ab48b5e348
|
Merge remote-tracking branch 'main/master'
Conflicts:
src/main/resources/support/http/resources/js/common.js
|
2012-08-27 10:33:12 +08:00 |
|
|
温高铁
|
f172f0a756
|
Merge pull request #86 from wenshao/master
tools.jar的依赖添加optional属性
|
2012-08-26 19:29:56 -07:00 |
|
|
wenshao
|
11d4b2b9b9
|
add tools.jar optional dependency
|
2012-08-27 10:23:55 +08:00 |
|
|
melin
|
22982099aa
|
add target="_blank"
|
2012-08-27 10:14:15 +08:00 |
|
|
melin
|
f7c9f3f190
|
修改email为个人主页地址
|
2012-08-27 10:10:34 +08:00 |
|
|
温高铁
|
6b3151975a
|
Merge pull request #84 from sandzhang/master
MapComparator修复及testcase
|
2012-08-26 18:51:50 -07:00 |
|
 sandzhang
|
3ec7c158e9
|
fix MapComparator and add testcase
|
2012-08-27 09:48:36 +08:00 |
|
|
温高铁
|
1ed493dee4
|
Merge pull request #83 from wenshao/master
weburi.html添加列JdbcExecuteErrorCount
|
2012-08-26 18:30:00 -07:00 |
|
|
wenshao
|
4d9a810dd6
|
weburi.html add column JdbcExecuteErrorCount
|
2012-08-27 09:28:38 +08:00 |
|
|
温高铁
|
747af77d41
|
Merge pull request #82 from wenshao/master
webapp添加Session数量统计
|
2012-08-26 18:18:19 -07:00 |
|
|
wenshao
|
3dfbe29a9a
|
webapp add sessionCount
|
2012-08-27 09:17:31 +08:00 |
|
|
温高铁
|
34a4845156
|
Merge pull request #81 from wenshao/master
添加testcase，去掉histogram的th中的title信息
|
2012-08-26 17:59:14 -07:00 |
|
|
wenshao
|
d6ee31a4ce
|
remove histogram th title
|
2012-08-27 08:58:03 +08:00 |
|
|
wenshao
|
5ce816807d
|
add testcase
|
2012-08-27 08:06:31 +08:00 |
|
|
温高铁
|
4b2966abe1
|
Merge pull request #80 from wenshao/master
添加webapp.html监控页面
|
2012-08-26 16:09:52 -07:00 |
|
|
wenshao
|
8121c92732
|
add webapp.html
|
2012-08-27 07:08:58 +08:00 |
|
|
温高铁
|
edf4a9ad22
|
Merge pull request #79 from wenshao/master
把console部分的testcase加入bvt
|
2012-08-26 08:09:48 -07:00 |
|
|
wenshao
|
e744fe74ec
|
move console testcase to bvt
|
2012-08-26 23:08:52 +08:00 |
|
|
温高铁
|
4f09fa9070
|
Merge pull request #78 from wenshao/master
add testcase
|
2012-08-26 08:02:10 -07:00 |
|
|
wenshao
|
aceaf3c1d7
|
add testcase
|
2012-08-26 23:01:07 +08:00 |
|
|
温高铁
|
50c576aff5
|
Merge pull request #77 from libinsong/master
add json view aip link
|
2012-08-26 06:56:52 -07:00 |
|
|
温高铁
|
4ea47bb449
|
Merge pull request #76 from wenshao/master
添加testcase
|
2012-08-26 06:54:24 -07:00 |
|
|
wenshao
|
87a623737d
|
add testcase & bug fixed
|
2012-08-26 21:53:06 +08:00 |
|
|
melin
|
cec28184da
|
detail页面添加view json api 链接
|
2012-08-26 21:38:55 +08:00 |
|
|
melin
|
0362a224d5
|
去掉style.css没有用到的样式定义
|
2012-08-26 21:30:58 +08:00 |
|
|
温高铁
|
47eff6d2ed
|
Merge pull request #75 from libinsong/master
add json view aip link
|
2012-08-26 06:25:05 -07:00 |
|
|
melin
|
26e2f0f011
|
Merge remote-tracking branch 'main/master'
|
2012-08-26 21:18:13 +08:00 |
|
|
melin
|
b273e4f30d
|
add json view aip link
|
2012-08-26 21:15:55 +08:00 |
|
|
温高铁
|
6c5b4710fd
|
Merge pull request #74 from wenshao/master
修正单元测试的问题
|
2012-08-26 05:21:19 -07:00 |
|
|
wenshao
|
c5b168d095
|
fix testcase
|
2012-08-26 20:20:14 +08:00 |
|
|
温高铁
|
954da816a5
|
Merge pull request #73 from wenshao/master
add testcase && bug fixed
|
2012-08-26 05:09:03 -07:00 |
|
|
wenshao
|
6124c91f6b
|
fix testcase
|
2012-08-26 20:07:28 +08:00 |
|
|
wenshao
|
bc0672cf62
|
add testcase & bug fixed
|
2012-08-26 19:58:36 +08:00 |
|
|
温高铁
|
e19f4b2dcb
|
Merge pull request #72 from wenshao/master
添加License信息和单元测试
|
2012-08-26 03:00:36 -07:00 |
|
|
wenshao
|
c3f4b79de4
|
add license
|
2012-08-26 17:59:23 +08:00 |
|
|
wenshao
|
6d44ef97a1
|
Merge remote-tracking branch 'upstream/master'
|
2012-08-26 17:42:48 +08:00 |
|