hmm
|
f3816e8304
|
Merge branch 'master' of https://github.com/lostcharlie/Bench4Q.git
Conflicts:
Bench4Q-Share/src/main/java/org/bench4q/share/models/agent/RunScenarioModel.java
|
2014-09-01 14:49:33 +08:00 |
|
hmm
|
2dcaf3664f
|
add loadFilterTypeList api
|
2014-09-01 14:46:57 +08:00 |
|
hmm
|
50de7f9815
|
add filteredTypes to RunScenarioModel
|
2014-09-01 14:46:36 +08:00 |
|
hmm
|
6954a15bf4
|
get respCode and respCntType from response
|
2014-09-01 14:46:07 +08:00 |
|
hmm
|
7ccd47d74b
|
add loadFilterTypeList api
|
2014-09-01 14:45:24 +08:00 |
|
hmm
|
a72cb7a307
|
add expectedResCode and expectedResCntType to http ui.xml
|
2014-09-01 14:45:05 +08:00 |
|
daisyonly
|
7a04393a14
|
Merge branch 'master' of https://github.com/lostcharlie/Bench4Q
|
2014-09-01 14:38:19 +08:00 |
|
daisyonly
|
6ba38aa94d
|
edit PluginEntitiFactory.java
edit PluginEntitiFactory.java
|
2014-09-01 14:38:02 +08:00 |
 coderfengyun
|
37622fc0ee
|
Merge branch 'master' of https://github.com/lostcharlie/Bench4Q
|
2014-09-01 11:07:48 +08:00 |
|
coderfengyun
|
b17334bfae
|
Merge branch 'master' of https://github.com/lostcharlie/Bench4Q
Conflicts:
Bench4Q-Agent/src/main/java/org/bench4q/agent/scenario/engine/ScenarioCo
ntext.java
Bench4Q-Agent/src/main/java/org/bench4q/agent/scenario/engine/ScenarioEn
gine.java
Bench4Q-Master/src/main/java/org/bench4q/master/api/TestPlanController.j
ava
Bench4Q-Web/src/main/java/org/bench4q/web/masterMessager/TestPlanMessage
r.java
Bench4Q-Web/src/test/java/org/bench4q/web/test/masterMessager/TestPlanMe
ssageTest.java
|
2014-09-01 11:07:30 +08:00 |
|
daisyonly
|
03b99cc27e
|
Merge branch 'master' of https://github.com/lostcharlie/Bench4Q
|
2014-09-01 10:50:24 +08:00 |
|
daisyonly
|
86a7926fef
|
edit editorFactory.js
edit editorFactory.js
|
2014-09-01 10:50:08 +08:00 |
|
hmm
|
c3af582914
|
change startrecording api
|
2014-09-01 10:43:02 +08:00 |
|
hmm
|
793d05ebb1
|
encode response with gzip
|
2014-09-01 10:42:43 +08:00 |
|
hmm
|
c52820b1ae
|
encode response with gzip
|
2014-09-01 10:42:05 +08:00 |
 luqiong
|
c0f3ac1daa
|
edit dialog of recordScript
|
2014-09-01 10:23:27 +08:00 |
|
coderfengyun
|
fb4e9937ea
|
adding the TestSchedule to agent
adding the TestSchedule to agent
|
2014-09-01 10:13:05 +08:00 |
|
luqiong
|
c2bcf8672a
|
add dialog of recordScript
|
2014-09-01 09:47:02 +08:00 |
|
coderfengyun
|
4c05dd7415
|
refactor
refactor
|
2014-09-01 09:09:42 +08:00 |
|
hmm
|
2b77bb473b
|
Merge branch 'master' of https://github.com/lostcharlie/Bench4Q.git
|
2014-09-01 08:53:51 +08:00 |
|
hmm
|
56bee56bab
|
add startProxyServer and startRecording api
|
2014-09-01 08:53:38 +08:00 |
|
coderfengyun
|
b08a7a3cf7
|
add async method for agentMessenger
add async method for agentMessenger
|
2014-08-31 21:39:04 +08:00 |
|
hmm
|
38b11ff38f
|
Merge branch 'master' of https://github.com/lostcharlie/Bench4Q.git
|
2014-08-29 17:37:14 +08:00 |
|
hmm
|
17178a2191
|
success to record baidu and show record flag
|
2014-08-29 16:35:15 +08:00 |
|
coderfengyun
|
24a529451e
|
refactor the tests
refactor the tests
|
2014-08-29 15:43:15 +08:00 |
|
coderfengyun
|
22cd79bb4e
|
Merge branch 'master' of https://github.com/lostcharlie/Bench4Q
|
2014-08-29 15:34:25 +08:00 |
|
coderfengyun
|
5ff8fb00ac
|
remove the bug of taskMaker
remove the bug of taskMaker that just make so many junk jobs
|
2014-08-29 15:34:14 +08:00 |
|
daisyonly
|
170d8524b1
|
edit ui.xml
edit ui.xml
|
2014-08-29 11:41:38 +08:00 |
|
hmm
|
0fb144f0df
|
Merge branch 'master' of https://github.com/lostcharlie/Bench4Q.git
|
2014-08-29 11:40:25 +08:00 |
|
hmm
|
40e98ba06e
|
change socket to httpurlconnection
|
2014-08-29 11:39:31 +08:00 |
|
daisyonly
|
f3923f64fd
|
edit dataCollect.js
edit dataCollect.js
|
2014-08-29 11:35:44 +08:00 |
|
daisyonly
|
28965ed380
|
add input content verification
add input content verification
|
2014-08-29 11:24:03 +08:00 |
|
daisyonly
|
c938d5734b
|
Merge remote-tracking branch 'origin/master'
|
2014-08-29 10:49:40 +08:00 |
|
daisyonly
|
2d2739f7ad
|
Revert "add content Verification"
This reverts commit 885758c3d3.
|
2014-08-29 10:26:55 +08:00 |
|
daisyonly
|
885758c3d3
|
add content Verification
add content Verification
|
2014-08-29 10:26:19 +08:00 |
|
coderfengyun
|
77168b6ac7
|
remove a warning from agent
remove a warning from agent
|
2014-08-29 08:58:42 +08:00 |
|
coderfengyun
|
ccc212b13f
|
No warning
No warning, if there's a warning, it cannot be called good code
|
2014-08-29 08:55:12 +08:00 |
|
hmm
|
bb12e44f1b
|
Merge branch 'master' of https://github.com/lostcharlie/Bench4Q.git
|
2014-08-28 16:43:21 +08:00 |
|
hmm
|
eb04ea7b18
|
change csvprovider parameter's show
|
2014-08-28 16:43:05 +08:00 |
|
hmm
|
a4451435a1
|
add required attribute to csvprovider ui.xml
|
2014-08-28 16:42:28 +08:00 |
|
luqiong
|
dd5160e48e
|
change picture to base64
|
2014-08-28 16:41:30 +08:00 |
|
coderfengyun
|
0d42c3e97a
|
refactor the tests
refactor the tests
|
2014-08-28 08:56:38 +08:00 |
|
coderfengyun
|
aaf7f00759
|
fix gitignore problem
|
2014-08-28 08:49:15 +08:00 |
|
coderfengyun
|
ef495e95be
|
add test about the bug emerging in sampling
add test about the bug emerging in sampling
|
2014-08-28 08:47:02 +08:00 |
|
daisyonly
|
1f6f999b35
|
Merge branch 'master' of https://github.com/lostcharlie/Bench4Q
|
2014-08-27 20:18:44 +08:00 |
|
daisyonly
|
e28d430da8
|
edit PluginDomainFactory
edit PluginDomainFactory
|
2014-08-27 20:18:27 +08:00 |
|
rzs840707
|
7626aca95f
|
HBase and MongoDB Plugin update
|
2014-08-27 16:26:41 +08:00 |
|
rzs840707
|
8fd8b0a890
|
Add Oracle Plugin
|
2014-08-27 16:03:20 +08:00 |
|
rzs840707
|
86dbdfad95
|
MongoDB Plugin,Changed to can connect a set of mongo servers
|
2014-08-27 15:57:14 +08:00 |
|
rzs840707
|
df7e03f7e3
|
change jdk build level to 1.7
|
2014-08-27 15:50:54 +08:00 |