479 commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Mengyi Zhou	f4d8ecc86f	do batch job on insert and delete	2015-07-24 11:32:50 +08:00
fanqq	6516da8615	proxy_next_upstream off	2015-07-23 17:12:13 +08:00
fanqq	d932395237	Merge branch 'github_dev' of https://github.com/ctripcorp/zeus into github_dev	2015-07-22 17:48:31 +08:00
fanqq	76adda6669	status optimize	2015-07-22 17:46:52 +08:00
Mengyi Zhou	271ba355b5	add tag to filter groups and slbs	2015-07-22 14:23:01 +08:00
Mengyi Zhou	9d8c0bd333	add json serializer to tag-model	2015-07-22 14:22:53 +08:00
Mengyi Zhou	2d8d2ea122	amend get property by item	2015-07-22 14:22:47 +08:00
Mengyi Zhou	f1dff95e67	add property test	2015-07-22 11:39:33 +08:00
Mengyi Zhou	019dfe34ad	add tag test	2015-07-22 11:39:33 +08:00
Mengyi Zhou	c31b39934c	sync table.sql	2015-07-22 11:39:32 +08:00
Mengyi Zhou	42c657176b	add tag query service	2015-07-22 11:39:31 +08:00
Mengyi Zhou	cb25919066	add resources	2015-07-22 11:39:31 +08:00
Mengyi Zhou	e2964824d1	continue dev	2015-07-22 11:39:30 +08:00
Mengyi Zhou	2393bc074a	update tag and property service	2015-07-22 11:39:29 +08:00
Mengyi Zhou	e1d7e2d937	add property model	2015-07-22 11:39:29 +08:00
Mengyi Zhou	1d840efaeb	add tagbox impl	2015-07-22 11:36:28 +08:00
Mengyi Zhou	b34a637d74	add tag model	2015-07-22 11:36:28 +08:00
fanqq	4f16fa7450	fix	2015-07-21 17:34:43 +08:00
fanqq	31bb6bfd68	add clean log job	2015-07-21 15:59:48 +08:00
fanqq	4c0acbf02c	update	2015-07-21 14:05:58 +08:00
fanqq	cea6d7c992	update	2015-07-21 13:47:39 +08:00
fanqq	88cd09299a	update	2015-07-21 10:30:25 +08:00
fanqq	d7b798a178	update order and Activate status	2015-07-20 18:51:06 +08:00
fanqq	bcd24371a3	Merge branch 'Operationlog' into github_dev	2015-07-20 18:10:36 +08:00
fanqq	95994cee2c	add Operation logs	2015-07-20 18:09:07 +08:00
fanqq	d2018138a3	log	2015-07-17 18:58:22 +08:00
fanqq	2fbf654bc9	update	2015-07-15 17:11:52 +08:00
fanqq	3072ac3b45	update	2015-07-15 15:46:02 +08:00
fanqq	1673c0c2fb	fix	2015-07-15 14:54:13 +08:00
fanqq	4e76110895	add ssl hello enable	2015-07-15 11:27:05 +08:00
fanqq	23661a7828	update	2015-07-14 17:54:26 +08:00
fanqq	a0e3db9551	add info log	2015-07-14 17:29:32 +08:00
Mengyi Zhou	f107af609a	update slb virtual server logic	2015-07-14 16:03:57 +08:00
fanqq	827cdb44a4	update	2015-07-14 15:01:09 +08:00
fanqq	9e46a335dd	update	2015-07-14 14:58:00 +08:00
fanqq	7bcce66fed	fix	2015-07-14 14:25:46 +08:00
fanqq	02accdd2d7	add get all resources	2015-07-14 13:51:09 +08:00
fanqq	2403290b3d	fix	2015-07-14 11:59:50 +08:00
Mengyi Zhou	ae8907bbe4	update sql ... Conflicts: src/main/java/com/ctrip/zeus/service/report/impl/DefaultReportService.java	2015-07-13 18:23:16 +08:00
fanqq	b1c3e3c312	Merge branch 'github_dev' of https://github.com/ctripcorp/zeus into github_dev	2015-07-13 17:02:12 +08:00
fanqq	f335b28f06	fix	2015-07-13 17:01:46 +08:00
Mengyi Zhou	e5557b82e6	add report status description	2015-07-13 16:49:02 +08:00
Mengyi Zhou	1e43824bc8	update model	2015-07-13 16:49:01 +08:00
Mengyi Zhou	92269b2cfa	fix bean creation cycle problem	2015-07-13 16:49:01 +08:00
fanqq	24b972e528	update auth	2015-07-13 16:11:26 +08:00
fanqq	e1d369c744	update	2015-07-10 18:47:09 +08:00
fanqq	a20c66c6ce	update status	2015-07-10 18:38:19 +08:00
Mengyi Zhou	75b6062da6	Merge branch 'messageReport' into github_dev	2015-07-10 17:54:34 +08:00
Mengyi Zhou	836ab04c63	add report module	2015-07-10 17:48:46 +08:00
Mengyi Zhou	243b3a4759	add report model	2015-07-10 17:48:28 +08:00