ctripcorp/zeus
1
1
Fork 0
mirror of https://github.com/ctripcorp/zeus.git synced 2024-09-21 08:06:08 +08:00
Code Issues Packages Projects Releases Wiki Activity
926 commits 21 branches 3 tags 20 MiB
Commit graph

926 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mengyi Zhou 0d8a634d4c fix bugs 2016-03-04 15:49:17 +08:00
Mengyi Zhou c2efa917b4 rel update fix 2016-03-04 13:26:04 +08:00
Mengyi Zhou b5846472a4 more restricted version check 2016-03-04 11:38:52 +08:00
Mengyi Zhou b2e69407a1 fix bugs after regression test 2016-03-03 19:12:43 +08:00
Mengyi Zhou 5a9d499372 change log format 2016-03-03 16:10:10 +08:00
Mengyi Zhou 940b5b0b4d fix bugs after regression test 2016-03-03 15:05:17 +08:00
Mengyi Zhou 0c16ff68ab add slb validation to vs add/update 2016-03-03 11:31:47 +08:00
fanqq e38ad13554 Merge branch 'rel' into github_dev 
Conflicts:
	src/main/java/com/ctrip/zeus/restful/resource/ActivateResource.java
	src/main/java/com/ctrip/zeus/restful/resource/DeactivateResource.java
	src/main/java/com/ctrip/zeus/restful/resource/OperationResource.java
	src/main/java/com/ctrip/zeus/restful/resource/StatusResource.java
	src/main/java/com/ctrip/zeus/service/status/HealthCheckStatusService.java
	src/main/java/com/ctrip/zeus/service/status/impl/GroupStatusServiceImpl.java
	src/main/java/com/ctrip/zeus/service/status/impl/HealthCheckStatusServiceImpl.java
 2016-03-03 11:13:37 +08:00
fanqq 73c14c3a0f add deactivateSlb 2016-03-02 16:56:23 +08:00
fanqq 35f1d50d7b fix bug 2016-03-02 16:13:27 +08:00
fanqq 9cd519f877 add activateVirtualServer check and fix serverOps bug 2016-03-02 15:47:12 +08:00
Mengyi Zhou f836741fab bug fix 2016-03-02 15:38:07 +08:00
fanqq cb1f4b15e0 Merge remote-tracking branch 'origin/rel' into rel 2016-03-02 11:23:29 +08:00
fanqq 0caee0d9ff bug fix 2016-03-02 11:23:11 +08:00
fanqq 6024ce4042 add TaskExecutorTask rm quartz 
Conflicts:
	src/main/resources/spring-context-quartz.xml
 2016-03-02 11:22:43 +08:00
Mengyi Zhou 3e7bad0487 finish port impl 2016-03-02 11:21:58 +08:00
fanqq e059c3663e fix circular ref 2016-03-02 11:20:56 +08:00
fanqq 83e9dfe1e9 fix bug healthcheck fetch bug 2016-03-02 11:19:36 +08:00
Mengyi Zhou 2fcaa56433 update batch get groups by gs 2016-03-02 11:09:27 +08:00
fanqq 36c1411d22 hotfix add apiTimeout 2016-03-01 12:47:53 +08:00
fanqq 2a472828aa hot fix status/group 2016-03-01 12:47:41 +08:00
fanqq 67f82aa53d add job unlock api 2016-02-29 17:50:45 +08:00
fanqq 28d428a7d4 update HealthCheckFetchTask 2016-02-29 15:58:27 +08:00
Mengyi Zhou 4872565a13 update access log format 2016-02-29 11:08:20 +08:00
fanqq fdb327feb8 Merge remote-tracking branch 'origin/rel' into rel 2016-02-25 20:48:39 +08:00
fanqq a0c9244322 HEALTH_CHECK rebuild 2016-02-25 20:48:02 +08:00
Mengyi Zhou 08f8b764cd remove unnecessary table field 2016-02-25 15:46:58 +08:00
fanqq 2dafeb8c00 update executeJob 
Conflicts:
	src/main/java/com/ctrip/zeus/executor/impl/TaskExecutorImpl.java
	src/main/java/com/ctrip/zeus/service/status/impl/StatusServiceImpl.java

Conflicts:
	src/main/java/com/ctrip/zeus/executor/impl/TaskExecutorImpl.java
	src/main/java/com/ctrip/zeus/service/status/impl/StatusServiceImpl.java
 2016-02-24 18:46:28 +08:00
Mengyi Zhou c09aa7b2ab fix report bug of vs update 2016-02-24 18:44:06 +08:00
Mengyi Zhou e81913b25f fix test case of compile error 2016-02-24 18:42:52 +08:00
fanqq f32d58c9df fix error 2016-02-24 18:42:51 +08:00
Mengyi Zhou 7ab610a7af test case fix up 2016-02-24 18:42:51 +08:00
Mengyi Zhou 4434e9a805 bug fix 2016-02-24 18:42:50 +08:00
Mengyi Zhou 2a0141529e refactoring 2016-02-24 18:42:49 +08:00
Mengyi Zhou c509172126 change multi rel logics back to 2 version maintenance 2016-02-24 18:42:49 +08:00
Mengyi Zhou d2093b82bb refactor entityFactory 2016-02-24 18:42:48 +08:00
Mengyi Zhou 8027806ff5 change usage of query executor 2016-02-24 18:42:48 +08:00
Mengyi Zhou 63ca66cc98 change name from model mode to selection mode 2016-02-24 18:42:47 +08:00
Mengyi Zhou de7513032f bug fix 2016-02-24 18:42:46 +08:00
Mengyi Zhou 3c719576e8 remove archive service 2016-02-24 18:42:46 +08:00
Mengyi Zhou 9e4b2484cb modify upgrading certificate interface 2016-02-24 18:42:45 +08:00
fanqq be7bec8d31 update for entityfactory 2016-02-24 18:42:45 +08:00
Mengyi Zhou 4537035fd3 fix tests 2016-02-24 18:42:44 +08:00
Mengyi Zhou df34b200c9 add impl of entityFactory 2016-02-24 18:42:44 +08:00
fanqq b2382a11f5 update rel rebuild task 2016-02-24 18:42:43 +08:00
Mengyi Zhou 886d3cc505 archive in json 2016-02-24 18:42:42 +08:00
Mengyi Zhou 4aeebdbe53 fix test cases 2016-02-24 18:42:42 +08:00
Mengyi Zhou f5e6bfe3d4 update online status by id-version 2016-02-24 18:42:41 +08:00
Mengyi Zhou 14b9b5f39b wrap query for task executor 2016-02-24 18:42:41 +08:00
fanqq 2b3969c65f update 2016-02-24 18:42:40 +08:00