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

896 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mengyi Zhou ea7f740678 reduce track log pressure 2015-12-03 12:41:10 +08:00
Mengyi Zhou 32d515a820 fix log line bug 2015-12-03 12:41:07 +08:00
Mengyi Zhou 09870c699f send metrics 2015-12-03 12:40:43 +08:00
fanqq 5805d39b53 Merge branch 'task_rebuild' into github_dev 2015-12-02 18:05:36 +08:00
fanqq 28ce65b7e8 add is vs activated interface 2015-12-02 14:02:17 +08:00
fanqq 78def30c37 Merge branch 'task_rebuild' into github_dev 2015-12-01 19:02:58 +08:00
fanqq 345cb589ab update group status 2015-12-01 19:02:23 +08:00
fanqq fb034c8ea0 Merge branch 'task_rebuild' into github_dev 2015-12-01 16:48:12 +08:00
fanqq c6e7f518b3 Merge remote-tracking branch 'origin/github_dev' into task_rebuild 
Conflicts:
	src/main/java/com/ctrip/zeus/service/build/conf/LocationConf.java
 2015-12-01 15:31:49 +08:00
fanqq 63decd59ef Merge remote-tracking branch 'origin/task_rebuild' into task_rebuild 2015-12-01 15:19:11 +08:00
fanqq f464244056 fix deactivate 2015-12-01 15:16:53 +08:00
Mengyi Zhou f25d0cffdd fix redirect bug 2015-12-01 11:45:21 +08:00
Mengyi Zhou 7dd5c42959 fix redirect bug 2015-12-01 11:34:12 +08:00
fanqq 71d788a90d fix op log bug 2015-12-01 10:06:31 +08:00
fanqq ec96df3867 use off line group status instead of on line status 2015-11-30 16:33:35 +08:00
fanqq 4a5b8f255c update op resources 2015-11-30 16:13:37 +08:00
fanqq 3235ef4771 update 2015-11-30 15:25:03 +08:00
Mengyi Zhou 4f3a452f20 add sync group status 2015-11-30 15:23:02 +08:00
fanqq d9e98a0298 add slb id for activate group 2015-11-30 13:36:01 +08:00
fanqq abb9efe661 update deactivate vs 2015-11-26 17:48:53 +08:00
fanqq e909705820 fix Virtual server 2015-11-26 16:57:26 +08:00
fanqq 9336546c2a clean job add simple log and start time ； healthcheck stats fetch every 5s ；task fail message add exception failcause 2015-11-26 16:35:08 +08:00
fanqq 06e837ae9e add exception stack to failcause 2015-11-26 15:27:29 +08:00
fanqq aad1950723 fix update 2015-11-26 14:58:44 +08:00
fanqq 8ecad3736a fix status health check 2015-11-25 16:54:30 +08:00
fanqq 11023f18b3 activated vs data fill 2015-11-25 14:26:56 +08:00
fanqq a86d30f971 Merge branch 'github_dev' into task_rebuild 
Conflicts:
	src/main/java/com/ctrip/zeus/service/model/GroupRepository.java
	src/main/java/com/ctrip/zeus/service/model/impl/GroupRepositoryImpl.java
	src/main/resources/META-INF/wizard/jdbc/wizard.xml
 2015-11-25 14:04:06 +08:00
fanqq 65f936ce05 add vg build 2015-11-24 18:17:57 +08:00
Mengyi Zhou 394fab59ba add virtual value for conf gen 2015-11-24 14:46:23 +08:00
Mengyi Zhou 341cea2b2b bug fix 2015-11-23 18:17:07 +08:00
Mengyi Zhou 2d4aebb71e add vgroupvalidator 2015-11-23 17:36:37 +08:00
Mengyi Zhou 700c2f9563 autofill vgroup 2015-11-23 17:36:25 +08:00
Mengyi Zhou 47869cb5a9 impl virtual group logics 2015-11-23 17:36:14 +08:00
Mengyi Zhou f81189fcff add virtual group model field and db table 2015-11-23 17:36:04 +08:00
Mengyi Zhou ce5db58e8f add root path order 2015-11-23 17:35:56 +08:00
fanqq a7935d1427 add $proxy_host ; add keepalive settings 2015-11-23 16:29:56 +08:00
fanqq 8058046bef update daobeans and components 2015-11-23 15:52:41 +08:00
fanqq 9ddeb8232d Merge branch 'github_dev' into task_rebuild 
Conflicts:
	src/main/java/com/ctrip/zeus/executor/impl/TaskExecutorImpl.java
	src/main/java/com/ctrip/zeus/service/model/handler/impl/VirtualServerEntityManager.java
	src/main/java/com/ctrip/zeus/service/model/impl/GroupRepositoryImpl.java
	src/main/java/com/ctrip/zeus/service/status/StatusService.java
	src/main/java/com/ctrip/zeus/service/status/impl/GroupStatusServiceImpl.java
	src/main/java/com/ctrip/zeus/service/status/impl/StatusServiceImpl.java
 2015-11-23 14:57:14 +08:00
fanqq 53321eb505 update 2015-11-23 14:47:03 +08:00
fanqq 942cbd9566 update 2015-11-20 18:02:11 +08:00
Mengyi Zhou 75e0b994c7 add vs archive interface 2015-11-19 17:27:32 +08:00
fanqq 87a131af1f update defaultGroupValidator and OperationResource 2015-11-19 16:09:44 +08:00
Mengyi Zhou bf09fd32be compare record 2015-11-19 15:47:26 +08:00
fanqq 75a6ac34c3 rebuild task module , rebuild status module , rebuild activate module 2015-11-19 15:12:05 +08:00
Mengyi Zhou 0ce9ae41cd add log tracker and roughly check log rotate 2015-11-19 15:05:27 +08:00
Mengyi Zhou 79f202ec0e add test and fix bugs 2015-11-19 13:50:11 +08:00
Mengyi Zhou 2f3ad51423 add worker 2015-11-18 16:41:32 +08:00
Mengyi Zhou e16b727f69 add batch job 2015-11-18 16:41:23 +08:00
Mengyi Zhou a09c1e4105 remove duplicated key 2015-11-17 16:01:04 +08:00
Mengyi Zhou 97317abd17 add easy parsing test 2015-11-17 15:53:48 +08:00