Commit Graph

10627 Commits

Author SHA1 Message Date
W23123 a72ba55141 Merge remote-tracking branch 'origin/dev' into dev 2020-03-24 16:14:42 +08:00
W23123 c208f0705a 资源池 2020-03-24 16:14:27 +08:00
shiziyuan9527 0e0980ee1f Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-03-24 16:09:29 +08:00
shiziyuan9527 16f16ab89d 修改请求统计表格 2020-03-24 16:07:52 +08:00
W23123 9532e1adc0 资源池 2020-03-24 16:07:19 +08:00
W23123 5dff901211 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	backend/src/main/resources/generatorConfig.xml
2020-03-24 16:05:13 +08:00
W23123 0329313845 节点信息 存进 test_resource 表 2020-03-24 16:04:43 +08:00
shiziyuan9527 55d7a806fd 报告-请求统计表格 2020-03-24 14:37:30 +08:00
Captain.B 20099c351e Merge branch 'dev' of github.com:fit2cloudrd/metersphere-server into dev 2020-03-24 11:33:15 +08:00
Captain.B 6589326868 查询资源池 2020-03-24 11:33:07 +08:00
chenjianxing 6b8c059f99 merge 2020-03-24 10:48:02 +08:00
chenjianxing a9845bf8d4 添加用例跟踪相关 2020-03-24 10:35:07 +08:00
Captain.B fdb6d69050 engine 2020-03-23 18:58:14 +08:00
shiziyuan9527 e699eaf04d jtl test 2020-03-23 18:23:51 +08:00
shiziyuan9527 a06b77b38c jtl parse 2020-03-23 17:35:35 +08:00
Captain.B 17bf685d05 Merge remote-tracking branch 'origin/dev' into dev 2020-03-23 17:11:40 +08:00
Captain.B 8652b0566d 配置资源池 2020-03-23 17:11:07 +08:00
W23123 172688f3e1 资源池添加 loading 2020-03-23 17:08:27 +08:00
W23123 7a04d8f47a Merge remote-tracking branch 'origin/dev' into dev 2020-03-23 16:39:24 +08:00
W23123 10b005ba0b 添加校验资源池 K8s 和 node 是否有效 2020-03-23 16:39:04 +08:00
Captain.B ca66c782d8 Merge branch 'dev' of github.com:fit2cloudrd/metersphere-server into dev 2020-03-23 15:44:23 +08:00
Captain.B ffba30cf85 jmx 记录开始时间 2020-03-23 15:44:15 +08:00
W23123 a62eaa55e0 Merge remote-tracking branch 'origin/dev' into dev 2020-03-23 15:42:50 +08:00
W23123 52105972fb 资源池 完成 95% 和 修改label-position="right" 2020-03-23 15:41:23 +08:00
Captain.B 952eabf628 Merge remote-tracking branch 'origin/dev' into dev 2020-03-23 15:00:44 +08:00
Captain.B bbdb987b64 csv 解析 2020-03-23 15:00:27 +08:00
chenjianxing 41a712435b 去掉zalenium相关 2020-03-23 13:38:45 +08:00
Captain.B 34fe47c1bc Merge remote-tracking branch 'origin/dev' into dev 2020-03-20 17:16:07 +08:00
Captain.B 1210d4c8c3 jmeter report type 2020-03-20 17:14:49 +08:00
W23123 4f6a50a9ec Merge remote-tracking branch 'origin/dev' into dev 2020-03-20 17:06:39 +08:00
W23123 233636f2d8 资源池 完成 80% 2020-03-20 17:03:00 +08:00
Captain.B 48a620c9cd 加载测试数据 2020-03-20 15:40:12 +08:00
Captain.B 12453009ea bug fix 2020-03-20 11:13:35 +08:00
Captain.B 6253ac17c6 配合使用csv 2020-03-19 20:58:31 +08:00
Captain.B 9c5d32d4c6 Merge remote-tracking branch 'origin/dev' into dev 2020-03-19 18:56:01 +08:00
Captain.B 86113caae1 多文件上传修改 2020-03-19 18:53:41 +08:00
W23123 28314b6275 Merge remote-tracking branch 'origin/dev' into dev 2020-03-19 16:11:15 +08:00
W23123 3805e40f72 资源池表增加 type、info 字段 和 资源池 table 分页 2020-03-19 16:10:55 +08:00
Captain.B f0dcf4e364 test status 2020-03-19 13:54:59 +08:00
Captain.B ed3186caf8 test status 2020-03-19 11:59:24 +08:00
chenjianxing b6e3b104f3 Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-03-18 18:37:07 +08:00
chenjianxing 017f864063 测试报告同步 2020-03-18 18:36:42 +08:00
chenjianxing 147fba84ed 功能测试测试报告同步和展示 2020-03-18 18:34:29 +08:00
Captain.B 27fdb74450 Merge remote-tracking branch 'origin/dev' into dev 2020-03-18 16:36:54 +08:00
Captain.B bdc162e028 tear down 2020-03-18 16:33:40 +08:00
shiziyuan9527 330f9def83 DockerTestEngine 2020-03-18 14:53:31 +08:00
Captain.B e2af4ef462 mybatis version 2020-03-17 19:15:54 +08:00
Captain.B 9888e4acbc test.name 2020-03-17 17:55:14 +08:00
Captain.B 24faaca274 添加自定义字段 2020-03-17 15:42:51 +08:00
Captain.B c6b24f35bd 小改动 2020-03-17 14:30:29 +08:00