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
961 commits 21 branches 3 tags 20 MiB
Commit graph

961 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
syg 537efe2a06 commit service interface 2016-03-21 14:43:26 +08:00
fanqq fec7ccdcef rollback add online status for group status 2016-03-21 10:50:59 +08:00
Mengyi Zhou 62832e2042 fix nullpointerex 2016-03-18 18:40:11 +08:00
fanqq 4eda898a9e add online status for group status 2016-03-18 15:27:55 +08:00
fanqq 74cd5d6429 fix update 2016-03-15 17:05:19 +08:00
fanqq 6859d6eec1 fix 2016-03-15 16:27:11 +08:00
fanqq 6a70ebe750 fix HealthCheckConf 2016-03-15 16:09:40 +08:00
fanqq c533b21108 hot fix HealthCheckStatusService bug 2016-03-11 17:06:18 +08:00
Mengyi Zhou 10d8cce69c order by id 2016-03-09 17:41:19 +08:00
Mengyi Zhou 1a7cbd9de5 refine accesslog analyzer module 2016-03-09 14:44:39 +08:00
fanqq 2f69977857 add always update config for HealthCheck fetch 2016-03-09 12:46:12 +08:00
fanqq dc647cf5b6 fix 2016-03-09 12:37:16 +08:00
fanqq 284f97a70f logger 2016-03-09 12:29:58 +08:00
fanqq fb24d9e94a add log for HealthCheckFetchTask 2016-03-09 12:14:57 +08:00
fanqq 052624cb61 fix HealthCheck keep alive 2016-03-09 12:14:42 +08:00
fanqq 9f83c87640 skip group status while missing message 2016-03-08 20:26:55 +08:00
Mengyi Zhou ff751b3a66 fix validation 2016-03-08 19:57:11 +08:00
fanqq de81049b00 Merge remote-tracking branch 'origin/github_dev' into github_dev 2016-03-08 19:37:06 +08:00
fanqq 411dc5db67 fix HealthCheckStatusService bug 2016-03-08 19:34:45 +08:00
Mengyi Zhou 1232bfbb66 add version as key to duplicate path 2016-03-08 19:34:45 +08:00
fanqq d3d8a82ca2 Merge remote-tracking branch 'origin/github_dev' into github_dev 2016-03-08 16:21:20 +08:00
fanqq 49cf2913e1 hot fix Status api 2016-03-08 16:20:46 +08:00
Mengyi Zhou e657765ac2 hot fix autofill 2016-03-08 15:08:09 +08:00
Mengyi Zhou 0a979c06f2 add log and check invalid id 2016-03-08 13:40:59 +08:00
vwxc王兴朝 aa2934ad51 Refactor task TaskWorkerImpl and change log level from error to warn 2016-03-08 13:37:16 +08:00
Mengyi Zhou 6e7d5016e1 bug fix updateStatus 2016-03-08 12:27:05 +08:00
vwxc王兴朝 eef8c03766 Merge branch 'github_dev' of github.com:ctripcorp/zeus into github_dev 2016-03-08 12:08:29 +08:00
vwxc王兴朝 7f783658fb update .gitignore to ignore Local Log file; Add disalbeAll tasks config; Ignore nginx task if i'm not a slb server 2016-03-08 12:08:13 +08:00
Mengyi Zhou 14f3c95e01 bug fix update status 2016-03-08 11:59:22 +08:00
fanqq 425e729942 Merge remote-tracking branch 'origin/github_dev' into github_dev 2016-03-08 11:42:49 +08:00
fanqq 7de084eead fix softDeactivateGroup and add api 2016-03-08 11:42:27 +08:00
Mengyi Zhou 1d4340e63b bug fix 2016-03-08 11:12:24 +08:00
fanqq 1b3401b3a3 add SOFT_DEACTIVATE_GROUP task and update /api/activate/group 2016-03-07 20:26:19 +08:00
fanqq 95d0ecbac4 fix bug 2016-03-04 19:08:38 +08:00
fanqq 63f5e35d43 fix 2016-03-04 16:23:44 +08:00
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