Commit graph

793 commits

Author SHA1 Message Date
fanqq a1afa92ac4 update activate slb 2015-12-11 17:57:11 +08:00
Mengyi Zhou 8c08aa07e4 add two archive batch get for task 2015-12-11 17:01:38 +08:00
fanqq 0cd0437505 pull fix 2015-12-11 16:27:17 +08:00
fanqq 7a1994be82 Merge branch 'github_dev' of https://github.com/ctripcorp/zeus into github_dev
Conflicts:
	src/main/java/com/ctrip/zeus/service/activate/impl/ActivateServiceImpl.java
2015-12-11 16:24:39 +08:00
fanqq 24e75d856b batch update status group server 2015-12-11 16:23:34 +08:00
Mengyi Zhou 2d1013792e optimize dist-lock table layout 2015-12-11 13:46:23 +08:00
fanqq 4c012ce915 update 2015-12-11 11:22:39 +08:00
fanqq 022bac91c7 upate 2015-12-10 19:48:30 +08:00
fanqq c2f68c2323 Merge branch 'github_dev' of https://github.com/ctripcorp/zeus into github_dev 2015-12-10 19:19:49 +08:00
Mengyi Zhou d4442dddb2 delete by groupName 2015-12-10 15:24:34 +08:00
fanqq b50b1c0bb7 Merge branch 'github_dev' of https://github.com/ctripcorp/zeus into github_dev 2015-12-10 15:13:11 +08:00
Mengyi Zhou 12b81c03fb batch get archive by ids and versions 2015-12-10 15:12:05 +08:00
Mengyi Zhou db4b2b920e read from current file index 2015-12-10 13:41:53 +08:00
Mengyi Zhou c69b886d5c add startMode to tracker strategy 2015-12-10 13:41:52 +08:00
Mengyi Zhou 90b732c71a refine group delete response 2015-12-10 11:27:10 +08:00
Mengyi Zhou 316537dc67 add success message model 2015-12-10 11:27:03 +08:00
fanqq 1024f65883 status bug fix 2015-12-10 10:56:45 +08:00
fanqq 0122779f6e update vs activate and group activate 2015-12-09 19:29:23 +08:00
xingchaowang d60ebbf15c Merge branch 'github_dev' of github.com:ctripcorp/zeus into github_dev 2015-12-08 19:01:32 +08:00
xingchaowang 4949ecd3d6 add SlbRequestLogHandler 2015-12-08 19:00:28 +08:00
Mengyi Zhou 4d256af1c8 change vs get strategy when batch get groups 2015-12-08 18:28:52 +08:00
Mengyi Zhou b9060a932f remove redundant vs filling 2015-12-08 17:59:05 +08:00
xingchaowang ac6dab3fa8 add SlbRequestLog 2015-12-08 16:08:42 +08:00
Mengyi Zhou 7d461ce8bf upgrade dal 2015-12-07 19:31:24 +08:00
Mengyi Zhou 65c47c04bf avoid constructor ex 2015-12-07 16:53:49 +08:00
Mengyi Zhou edf7650359 update dal lib 2015-12-07 15:52:06 +08:00
Mengyi Zhou 074bebe0cc refine task interface 2015-12-07 15:52:05 +08:00
Mengyi Zhou f73966134a remove internal lib impl 2015-12-07 15:28:19 +08:00
xingchaowang 2f02d4be9b add task executor framework 2015-12-07 12:46:40 +08:00
Mengyi Zhou 24389d318e temporary fixup for github compiling 2015-12-07 12:21:24 +08:00
Mengyi Zhou c7ec6b2107 fix bug of file tracker log 2015-12-04 18:26:01 +08:00
Mengyi Zhou 2181eed6c6 fix group member filling bug 2015-12-03 15:13:36 +08:00
Mengyi Zhou 30470c2f46 fix array out of bounds in cert service 2015-12-03 15:13:36 +08:00
Mengyi Zhou 59dc5680d2 move removable validation to validator 2015-12-03 15:13:35 +08:00
fanqq 66280a9255 Merge branch 'github_dev' of https://github.com/ctripcorp/zeus into github_dev 2015-12-03 15:09:29 +08:00
fanqq 1de7108a60 activate slb update 2015-12-03 15:07:13 +08:00
Mengyi Zhou a53bef32cb fixup! clean test env 2015-12-03 14:15:28 +08:00
fanqq bcd2671267 Merge branch 'github_dev' of https://github.com/ctripcorp/zeus into github_dev 2015-12-03 13:32:16 +08:00
fanqq cbc0398bea bug fix - activate deactivate vs 2015-12-03 13:31:36 +08:00
Mengyi Zhou 050be0c935 delete internal lib 2015-12-03 13:04:07 +08:00
Mengyi Zhou 0edfd5f3d9 log uncaught ex 2015-12-03 13:04:06 +08:00
Mengyi Zhou d0e687611a clean test env 2015-12-03 13:04:06 +08:00
Mengyi Zhou 5e73dcd9e1 modify format for missing log analysis 2015-12-03 13:04:05 +08:00
Mengyi Zhou 851b6041a5 report test 2015-12-03 13:04:05 +08:00
Mengyi Zhou ed677dd165 add more tests 2015-12-03 12:53:35 +08:00
Mengyi Zhou ab1718eaaa bug fix and refinement 2015-12-03 12:53:35 +08:00
Mengyi Zhou 195d4b7b5e add slbid info 2015-12-03 12:53:34 +08:00
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