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

1268 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mengyi Zhou 7959291734 update conf clean filter 2016-05-05 16:36:31 +08:00
Mengyi Zhou 6b99c828b9 change error page generation 2016-05-03 11:26:45 +08:00
Mengyi Zhou f766b6f4dd force set virtual value by api 2016-04-29 12:07:17 +08:00
fanqq 1c34d34d64 Merge remote-tracking branch 'origin/github_dev' into github_dev 2016-04-28 11:54:00 +08:00
fanqq 13452758c5 add default value 2016-04-28 11:50:24 +08:00
Mengyi Zhou 709f2c50e1 fix minor bug 2016-04-28 11:48:42 +08:00
Mengyi Zhou 94b8ba732b fix bug when writing location 2016-04-28 10:47:36 +08:00
Mengyi Zhou a18bf434e9 return single object when fetch slb by non-redundant mode 2016-04-28 10:19:44 +08:00
jiongyu ec3d1b5d57 add param "mode" to Path("/slb") 
Conflicts:
	src/main/java/com/ctrip/zeus/restful/resource/SlbResource.java
 2016-04-28 10:19:43 +08:00
fanqq 47c698339f add not found online group data check 2016-04-27 17:48:46 +08:00
Mengyi Zhou 72894afdb2 change vslookup source 2016-04-27 13:09:22 +08:00
lu.wang 1dc5c090a3 Fix scope of variables. 2016-04-27 12:31:20 +08:00
lu.wang 2369baafa0 Little fix. 2016-04-26 17:05:53 +08:00
lu.wang 66508e4b8b Merge branch 'readConfig' into github_dev 
Conflicts:
	src/main/java/com/ctrip/zeus/service/build/conf/ServerConf.java
 2016-04-26 16:01:31 +08:00
lu.wang e404f262aa Fix NullPointException. 2016-04-26 15:59:14 +08:00
lu.wang a9e9f988cb Fix compile error 2016-04-26 15:59:08 +08:00
Mengyi Zhou 58ef440be6 change medium text format to blob 2016-04-26 13:16:05 +08:00
lu.wang 76264874b3 Update conf and test case. 
Conflicts:
	src/main/java/com/ctrip/zeus/service/build/conf/UpstreamsConf.java
 2016-04-25 17:52:15 +08:00
Mengyi Zhou 05db4e27ab fixup! keep folders when operating confs 2016-04-25 16:34:18 +08:00
Mengyi Zhou 27e2970ea8 keep folders when operating confs 2016-04-25 16:31:21 +08:00
Mengyi Zhou f2fab65f76 add vs errorpage whitelist 2016-04-25 16:18:04 +08:00
Mengyi Zhou 5e4664dc45 add db clean filter 2016-04-25 14:24:19 +08:00
lu.wang 2d973f5a96 Update. 2016-04-25 13:53:30 +08:00
lu.wang 91bf7f25d9 Update conf relation code. 2016-04-25 13:51:34 +08:00
lu.wang 8c71cf84fd Modify conf relation code. 2016-04-25 13:08:42 +08:00
lu.wang 8c77e5ed0f Draft. 2016-04-25 13:01:36 +08:00
lu.wang 34c022960a Draft 2016-04-25 13:01:36 +08:00
Mengyi Zhou b68550e4ef isolate slb info when generating upstream conf name 2016-04-25 12:39:56 +08:00
fanqq 0bdc959acb fix related vs check 2016-04-25 11:36:17 +08:00
fanqq ba372da746 remove pre-check for softDeactivateGroupOps 2016-04-25 11:14:11 +08:00
Mengyi Zhou 5076319b76 fix bug of cannot get server conf 2016-04-22 18:17:27 +08:00
Mengyi Zhou 93e1a9c4a7 keep previous response data 2016-04-22 18:17:21 +08:00
Mengyi Zhou 923ed02147 fixup! change check strategy 2016-04-22 18:16:31 +08:00
Mengyi Zhou f530ee5861 change check strategy 2016-04-22 16:10:04 +08:00
Mengyi Zhou b8a56f1ffa add vs filter check 2016-04-22 15:55:09 +08:00
Mengyi Zhou 36bd1b1de2 test filter conf 2016-04-22 15:35:15 +08:00
Mengyi Zhou e28d27e989 test build service 2016-04-22 15:23:37 +08:00
Mengyi Zhou a54fa89cbb scan any use of abandoned components 2016-04-22 12:11:49 +08:00
Mengyi Zhou 7556c65996 manage conf read 2016-04-22 11:11:18 +08:00
Mengyi Zhou 8935463c25 manage conf write 2016-04-22 11:11:17 +08:00
Mengyi Zhou a755ddff43 add model and new table 2016-04-22 11:11:17 +08:00
fanqq 9d237398eb rename api path and status name 2016-04-21 15:50:36 +08:00
fanqq f7c283b15c add HEALTHY_OPS api 2016-04-21 15:29:13 +08:00
lu.wang 4c915c6c2d Add slb version release info api. 2016-04-21 10:41:06 +08:00
fanqq c531837b96 bug fix:[ skip reload condition] 2016-04-20 17:54:40 +08:00
fanqq 462fc261de add online member operation 2016-04-20 14:40:55 +08:00
fanqq 91914db25c add skip reload condition 2016-04-19 18:05:13 +08:00
Mengyi Zhou c201a7d987 optimize vs validation 
Conflicts:
	src/main/java/com/ctrip/zeus/restful/resource/VirtualServerResource.java
 2016-04-19 15:18:45 +08:00
Mengyi Zhou 24a53faf56 show domain name when throwing validation ex 2016-04-19 15:18:02 +08:00
fanqq 183c7b0e45 fix CleanDbTask bug 2016-04-18 18:34:00 +08:00