Mengyi Zhou
|
0e974e0a14
|
update interface
|
2015-04-24 14:11:42 +08:00 |
|
Mengyi Zhou
|
5248ba0df6
|
add lock owner
|
2015-04-24 14:11:42 +08:00 |
|
Mengyi Zhou
|
993122c39f
|
add lock status api
|
2015-04-24 14:11:41 +08:00 |
|
Mengyi Zhou
|
19f02014f5
|
add lock
|
2015-04-24 14:11:40 +08:00 |
|
fanqq
|
e20c2c690a
|
Merge branch 'dyups' into github_dev
|
2015-04-23 17:47:01 +08:00 |
|
fanqq
|
3e977ac649
|
add dyups to project and fix something bugs
|
2015-04-23 17:03:42 +08:00 |
|
fanqq
|
e7b26a0570
|
Merge branch 'github_dev' into ctrip_module_dev
|
2015-04-23 17:02:28 +08:00 |
|
Mengyi Zhou
|
1988d89fda
|
try parse req using json when mediatype is unknown
|
2015-04-23 16:57:14 +08:00 |
|
fanqq
|
d73b6d1196
|
fix config change error
|
2015-04-23 16:14:31 +08:00 |
|
fanqq
|
483ed009c4
|
ctrip commit config change
|
2015-04-23 16:14:13 +08:00 |
|
Mengyi Zhou
|
f1d25937db
|
fix get max version bug
|
2015-04-22 16:23:49 +08:00 |
|
mag
|
9f857a851d
|
Fix to add port in the app server status
|
2015-04-20 17:05:30 +08:00 |
|
Mengyi Zhou
|
0ba42080da
|
update exception message
|
2015-04-17 17:09:10 +08:00 |
|
fanqq
|
0e65514693
|
Merge branch 'module_dev' of https://github.com/ctripcorp/zeus into module_dev
|
2015-04-16 17:30:17 +08:00 |
|
fanqq
|
9e3d9dae26
|
format
|
2015-04-16 17:29:55 +08:00 |
|
Mengyi Zhou
|
d0072df419
|
Merge branch 'hotfix_slb_addvip' into module_dev
|
2015-04-16 14:24:53 +08:00 |
|
Mengyi Zhou
|
ea99b0836d
|
add slb vip info to app model
|
2015-04-16 12:29:23 +08:00 |
|
mag
|
a3d8893bb4
|
Fix bug for fetch app status restful api
|
2015-04-15 19:10:36 +08:00 |
|
fanqq
|
5e82becef1
|
add test report
|
2015-04-15 16:13:25 +08:00 |
|
fanqq
|
41648d55fa
|
fix
|
2015-04-15 14:17:03 +08:00 |
|
fanqq
|
79eb4de0f5
|
update test case
|
2015-04-14 17:00:51 +08:00 |
|
Mengyi Zhou
|
a350e3017a
|
add update integration test
|
2015-04-14 14:18:03 +08:00 |
|
Mengyi Zhou
|
977e92c3a0
|
reformat
|
2015-04-14 11:24:31 +08:00 |
|
fanqq
|
6586d94cc3
|
fix test case bug
|
2015-04-14 10:20:26 +08:00 |
|
fanqq
|
2742bce6c9
|
fix test case bug
|
2015-04-13 19:02:50 +08:00 |
|
fanqq
|
0883bcdd01
|
fix
|
2015-04-13 18:47:07 +08:00 |
|
fanqq
|
2ee2652a37
|
Merge branch 'module_dev' into ctrip_module_dev
|
2015-04-13 18:36:40 +08:00 |
|
fanqq
|
ea1f83c53c
|
fix bug (appslb is not include appname in the previous versions)
|
2015-04-13 18:34:32 +08:00 |
|
fanqq
|
0856a4c068
|
add IntegrationTest file
|
2015-04-13 17:58:53 +08:00 |
|
fanqq
|
02623bb7c1
|
delete a test file
|
2015-04-13 17:58:13 +08:00 |
|
fanqq
|
8c294e4997
|
add integration test and fix bug (app&slb delete)
|
2015-04-13 17:26:21 +08:00 |
|
fanqq
|
61a5254645
|
add activate status snapshot
|
2015-04-10 14:39:25 +08:00 |
|
fanqq
|
86e4898da0
|
add ops requirements
|
2015-04-08 14:05:03 +08:00 |
|
Mengyi Zhou
|
f7f4370873
|
Merge branch 'module_dev' of https://github.com/ctripcorp/zeus into module_dev
|
2015-04-07 18:51:49 +08:00 |
|
Mengyi Zhou
|
030f3db9ca
|
improve validation
|
2015-04-07 18:50:09 +08:00 |
|
fanqq
|
dc7c6cac90
|
add validate
|
2015-04-07 18:38:23 +08:00 |
|
fanqq
|
8fcd8f359f
|
Merge branch 'module_dev' of https://github.com/ctripcorp/zeus into module_dev
|
2015-04-07 16:53:42 +08:00 |
|
fanqq
|
0156a93243
|
fix bug and add test
|
2015-04-07 16:53:10 +08:00 |
|
Mengyi Zhou
|
293e62c524
|
return null instead of DalNotFoundException
|
2015-04-03 17:59:54 +08:00 |
|
Mengyi Zhou
|
e931cacafd
|
clean code
|
2015-04-03 16:41:00 +08:00 |
|
fanqq
|
a199b9f160
|
Merge branch 'module_dev' of https://github.com/ctripcorp/zeus into module_dev
|
2015-04-03 15:48:37 +08:00 |
|
fanqq
|
c3b1bb6e20
|
add TestCase
|
2015-04-03 15:46:43 +08:00 |
|
Mengyi Zhou
|
f5364be740
|
refine code
|
2015-04-03 13:54:41 +08:00 |
|
Mengyi Zhou
|
d01cfe0b24
|
add exception aspect
|
2015-04-02 19:13:13 +08:00 |
|
mag
|
8a0a7f5054
|
Throw out exception in resource and fix colocate nginx url
|
2015-04-02 17:02:23 +08:00 |
|
fanqq
|
f8a2559816
|
Merge branch 'module_dev' of https://github.com/ctripcorp/zeus into module_dev
|
2015-04-02 13:41:03 +08:00 |
|
mag
|
527473d0c6
|
Merge branch 'module_dev' of https://github.com/ctripcorp/zeus into module_dev
|
2015-04-02 11:14:43 +08:00 |
|
mag
|
35ef02b0ef
|
add app service interface
|
2015-04-02 10:31:03 +08:00 |
|
fanqq
|
9a6f50f6a4
|
Merge branch 'module_dev' of https://github.com/ctripcorp/zeus into module_dev
|
2015-04-02 09:59:10 +08:00 |
|
fanqq
|
bc05566dec
|
add test and change app.jsp
|
2015-04-02 09:57:48 +08:00 |
|