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

1240 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mengyi Zhou 43819d5b74 fix bug of querying by group server 2016-05-17 17:45:11 +08:00
Mengyi Zhou f8670aec45 add deleted entity archive 2016-05-17 17:37:23 +08:00
Mengyi Zhou 8d75e6252a remove deprecated api 2016-05-17 14:46:46 +08:00
Mengyi Zhou 6f8967170a make sure path exists 2016-05-17 14:18:36 +08:00
fanqq 7fdfd7f52b update TaskExecutor 2016-05-12 18:09:42 +08:00
Mengyi Zhou a3ce8ee9f3 fix bug of return null when fetching groups having version related with other vses than input 2016-05-12 16:34:45 +08:00
fanqq 393cb373fb Merge branch 'github_dev' of https://github.com/ctripcorp/zeus into github_dev 2016-05-10 19:12:22 +08:00
fanqq 6f78d65369 update log 2016-05-10 19:12:01 +08:00
Mengyi Zhou fd6e378710 check null value 2016-05-10 11:13:37 +08:00
fanqq 49d69c62d3 Merge branch 'github_dev' of https://github.com/ctripcorp/zeus into github_dev 2016-05-09 17:33:50 +08:00
fanqq daed096605 update log 2016-05-09 17:20:35 +08:00
fanqq 95c9dfd9b6 update loger 2016-05-09 17:04:28 +08:00
fanqq 2ddc315c11 update logs 2016-05-09 16:50:41 +08:00
lu.wang 077c557152 Merge branch 'github_dev' of github.com:ctripcorp/zeus into github_dev 2016-05-09 09:43:11 +08:00
lu.wang 2d70b9bb5f Update ip auth relation code and remove useless git properties. 2016-05-09 09:41:41 +08:00
fanqq bdbb5ce21d fix clean write file while rollback 2016-05-06 14:38:55 +08:00
fanqq f7c5c47982 Merge branch 'github_dev' of https://github.com/ctripcorp/zeus into github_dev 2016-05-05 19:36:56 +08:00
fanqq 8ca4b52a41 fix bug 2016-05-05 19:33:14 +08:00
lu.wang 95b173a8b4 First commit, 1.add commitId api, 2.add param diff for confInfos api. 2016-05-05 17:55:16 +08:00
fanqq b3ad6bf4ce conf clean job update 2016-05-05 17:43:55 +08:00
Mengyi Zhou 5218d9458e fix bug of conf cleansing job 2016-05-05 17:37:49 +08:00
Mengyi Zhou cd4c899522 safe delete history records 2016-05-05 16:36:39 +08:00
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