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

368 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
fanqq 7289379817 update healthcheck disable config 2015-06-24 17:20:00 +08:00
fanqq 6829a2461f update upstream name 2015-06-24 16:21:51 +08:00
fanqq 83048147ba Merge branch 'github_dev' of https://github.com/ctripcorp/zeus into github_dev 2015-06-24 15:53:13 +08:00
fanqq 3426030b20 fix dyups bug 2015-06-24 15:52:20 +08:00
Mengyi Zhou 2400e7900e detail as default get 2015-06-24 14:40:47 +08:00
fanqq e998396614 update clean files 2015-06-23 17:36:32 +08:00
fanqq c1d75dbcc2 Merge branch 'github_dev' of https://github.com/ctripcorp/zeus into github_dev 2015-06-23 15:55:34 +08:00
fanqq bb45887ead update write clean conf 2015-06-23 15:55:16 +08:00
Mengyi Zhou 5f30295b19 removable group validation 2015-06-23 11:59:12 +08:00
Mengyi Zhou a66e7bcca5 get slb/group by type(info, normal, detail) 2015-06-23 11:34:31 +08:00
fanqq bd7429e5e8 update 2015-06-19 18:50:46 +08:00
fanqq 41259afb07 update healthcheck 2015-06-19 18:48:44 +08:00
fanqq aed5692f9a fix write or reload fail bug 2015-06-19 15:37:55 +08:00
fanqq 931f189e04 update nginx/conf?vs=1&version=2 2015-06-19 14:40:17 +08:00
fanqq daee2d9104 Merge branch 'github_dev' of https://github.com/ctripcorp/zeus into github_dev 2015-06-19 14:25:25 +08:00
fanqq e5550e9348 update conf api 2015-06-19 14:24:55 +08:00
Mengyi Zhou 9beb14fd87 add get slb by virtual server 2015-06-19 14:24:10 +08:00
fanqq 20db3bb545 add ssl flag 2015-06-19 13:45:18 +08:00
fanqq c4b6c4dd1f Merge branch 'github_dev' of https://github.com/ctripcorp/zeus into github_dev 2015-06-19 11:07:16 +08:00
fanqq fcd56c5b1e update health check status 2015-06-19 11:06:36 +08:00
Mengyi Zhou 3acf1557d1 add slbId and slbName param to getGroups 2015-06-18 17:53:28 +08:00
fanqq 374841863a add group server default down and batch up/down member 2015-06-18 16:53:19 +08:00
fanqq 5815687911 add log filter 
Conflicts:
	src/main/java/com/ctrip/zeus/server/SlbAdminServer.java

Conflicts:
	src/main/java/com/ctrip/zeus/server/SlbAdminServer.java
 2015-06-18 15:15:16 +08:00
Mengyi Zhou 5d679b7f90 add api 2015-06-18 14:55:06 +08:00
Mengyi Zhou aa50cc3395 make traffic status fetch per min 2015-06-18 10:56:52 +08:00
Mengyi Zhou 8ba97672e1 Merge branch 'inject_collector_to_spring' into github_dev 
Conflicts:
	src/main/java/com/ctrip/zeus/restful/resource/NginxResource.java
	src/main/java/com/ctrip/zeus/restful/resource/StatusResource.java
 2015-06-17 19:08:02 +08:00
Mengyi Zhou f95ccd1adb update traffuc status 2015-06-17 19:05:06 +08:00
fanqq 0e8a167604 update log add access log 2015-06-17 14:10:54 +08:00
fanqq fedc904ca0 update result status 2015-06-17 11:06:29 +08:00
Mengyi Zhou ceb71e3cb2 finish injecting quartz lifecycle 2015-06-16 19:08:19 +08:00
Mengyi Zhou 0affc34958 update rollingTrafficStatus package info 2015-06-16 14:49:28 +08:00
fanqq 2d90998c87 fix deactivate bug 2015-06-16 14:33:19 +08:00
Mengyi Zhou e140635e37 change to quartz job 2015-06-16 14:11:46 +08:00
Mengyi Zhou 61ac933e0a add Quartz lib 2015-06-16 14:11:30 +08:00
Mengyi Zhou 0999976113 return object when new/update, delete func update, enable null healthcheck 2015-06-15 18:17:55 +08:00
fanqq 0040567fa5 update healthcheck 2015-06-15 17:33:08 +08:00
fanqq 06b7e12736 update health check headers and upstream name 2015-06-15 16:38:42 +08:00
fanqq 780914340b add health check disable config 2015-06-15 15:27:14 +08:00
fanqq a7fa012705 fix bug 2015-06-12 17:41:07 +08:00
fanqq 6355fed45c update health check config 2015-06-12 13:53:57 +08:00
fanqq e792c9a0bf update 2015-06-11 17:28:14 +08:00
fanqq 20f036dada update 2015-06-11 17:24:55 +08:00
fanqq b01e31efde Merge branch 'github_dev' of https://github.com/ctripcorp/zeus into github_dev 2015-06-11 17:11:24 +08:00
fanqq 0c09c0b7e5 add deactivate api 2015-06-11 17:10:57 +08:00
Mengyi Zhou 879201b804 fix bug of slb update and group delete 2015-06-11 16:46:39 +08:00
fanqq a9d421d0f3 update 2015-06-11 15:38:38 +08:00
fanqq a1869c1561 add rewrite empty check 2015-06-11 14:49:06 +08:00
fanqq 340fbf2668 Merge branch 'github_dev' of https://github.com/ctripcorp/zeus into github_dev 2015-06-11 10:30:21 +08:00
fanqq 3b1062abf9 update integration 2015-06-11 10:29:22 +08:00
Mengyi Zhou 6b2dc8692b fix slb update bug 2015-06-10 18:17:00 +08:00