Commit graph

1462 commits

Author SHA1 Message Date
Mengyi Zhou ff3520a55a add persistent switch 2016-10-19 17:16:59 +08:00
Mengyi Zhou 89477d7240 fix WrappedStringState builder 2016-10-14 16:43:55 +08:00
Mengyi Zhou 9f4ad830f4 delegate raw value 2016-10-14 16:08:05 +08:00
fanqq 0b7210ec76 update CrossDomainFilter 2016-10-13 17:04:50 +08:00
fanqq 77d5f31234 add flag 2016-10-13 16:41:09 +08:00
fanqq f93f19caa4 update consumer and add send message in ExceptionAspect 2016-10-13 16:38:55 +08:00
fanqq bcd0877783 add message data
Conflicts:
	src/main/java/com/ctrip/zeus/restful/resource/ActivateResource.java
	src/main/java/com/ctrip/zeus/restful/resource/GroupMemberResource.java
	src/main/java/com/ctrip/zeus/restful/resource/GroupResource.java
	src/main/java/com/ctrip/zeus/restful/resource/OperationResource.java
	src/main/java/com/ctrip/zeus/restful/resource/VirtualServerResource.java
2016-10-13 16:38:51 +08:00
fanqq 71ebfa1842 add new mq producer
Conflicts:
	src/main/java/com/ctrip/zeus/restful/resource/ActivateResource.java
	src/main/java/com/ctrip/zeus/restful/resource/GroupResource.java
	src/main/java/com/ctrip/zeus/restful/resource/OperationResource.java
	src/main/java/com/ctrip/zeus/restful/resource/VirtualServerResource.java
2016-10-13 16:38:46 +08:00
Mengyi Zhou 41269256a5 fix cross domain error 2016-10-13 16:10:54 +08:00
Mengyi Zhou 6255a2d4df switch start and add process 2016-10-12 16:59:36 +08:00
Mengyi Zhou 6360c85927 add task deactivate vs 2016-10-12 12:17:55 +08:00
Mengyi Zhou ef35c8e25e backward compatible bug fix 2016-10-12 11:39:49 +08:00
Mengyi Zhou 8a7bbe3dbb fix bug of vgroup lookup if result is empty 2016-10-12 10:46:39 +08:00
Mengyi Zhou baf1e18f2e fix bug of generating conf of activating slb 2016-10-11 14:54:30 +08:00
Mengyi Zhou 9ebb0937dd support deprecated field slb-id 2016-10-11 12:35:25 +08:00
Mengyi Zhou e7c33a2bb4 set slb-id first before vs validation 2016-10-11 12:07:13 +08:00
Mengyi Zhou 5e00c4e6f5 Merge remote-tracking branch 'github/slb-vs-n2n' into github_dev 2016-10-10 19:44:05 +08:00
Mengyi Zhou 636cf7bc68 remove duplicate 2016-10-10 17:13:05 +08:00
fanqq d2b4624345 add large client header buffers and gzip 2016-10-09 18:02:54 +08:00
fanqq 6e9d08e9d8 fix 2016-10-08 11:07:16 +08:00
fanqq c526d03e21 clean unused files 2016-10-08 11:01:50 +08:00
Mengyi Zhou 058f8b9de5 support deprecated field slb-id 2016-09-30 15:38:25 +08:00
fanqq 22af8d4756 add shuffle server before dyupstream 2016-09-30 15:02:25 +08:00
Mengyi Zhou 19dab3dc0a add soft deactivate vsids to commit 2016-09-29 18:10:34 +08:00
Mengyi Zhou f8865bcd8b fix serialization problem 2016-09-29 18:10:29 +08:00
Mengyi Zhou c27ad11519 Merge branch 'github_dev' into slb-vs-n2n 2016-09-29 14:51:24 +08:00
Mengyi Zhou 89b04ac35f skip null value when no other groups under the target vs 2016-09-29 14:43:41 +08:00
Mengyi Zhou 29438e2b80 fix unit tests 2016-09-29 13:37:44 +08:00
Mengyi Zhou 9984f7fcfe fix list size 2016-09-29 13:37:44 +08:00
Mengyi Zhou fffe740105 update 2016-09-29 13:37:44 +08:00
Mengyi Zhou 3723d4d5c1 refactoring task executor 2016-09-29 13:37:44 +08:00
Mengyi Zhou 09deb0c7b0 refactoring task executor 2016-09-29 13:37:44 +08:00
Mengyi Zhou 0143e77846 remove old integration tests and modify meta tests to fix compiling errors 2016-09-29 13:37:44 +08:00
Mengyi Zhou a79bf4a55a remove vs/slb from group status and remove hc module 2016-09-29 13:37:44 +08:00
Mengyi Zhou 322d7cf4ec refactoring vs tasks generation 2016-09-29 13:37:44 +08:00
Mengyi Zhou d717eb4c74 reformat 2016-09-29 13:37:44 +08:00
Mengyi Zhou 717b8daa7b fixing compiling errors after model change 2016-09-29 13:37:44 +08:00
Mengyi Zhou c6278f4e20 migrate json parser 2016-09-29 13:37:44 +08:00
Mengyi Zhou 9534a42c5e fixup! update model def 2016-09-29 13:37:18 +08:00
Mengyi Zhou 7d4f87a648 refactor n2n maintainer 2016-09-29 13:37:18 +08:00
Mengyi Zhou cb92eeeb08 update model def 2016-09-29 13:37:18 +08:00
Mengyi Zhou 8b206c5663 fix bug of consumer pool creation if access log does not exist 2016-09-29 12:19:29 +08:00
fanqq 8be643a5d1 update healthy property values 2016-09-28 15:51:15 +08:00
Mengyi Zhou b8d9839560 re-init watch service if failed 2016-09-28 15:36:04 +08:00
Mengyi Zhou 758c400241 fix bug of path validation of root path 2016-09-28 13:19:12 +08:00
fanqq 3c7ba64d5e add group healthy Property 2016-09-26 19:33:55 +08:00
fanqq 71bdd1e754 fix operationLog aop 2016-09-26 13:55:59 +08:00
fanqq 60dfa34f20 update parseGroup in OperationLogAspect 2016-09-22 14:25:01 +08:00
fanqq 9ea0cc6101 add produceMessage and add fetchMessage enable flag 2016-09-21 14:12:16 +08:00
Mengyi Zhou 159bd63614 fix bug 2016-09-20 16:08:21 +08:00