695 commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
fanqq	c8adc67868	fix	2015-07-10 14:03:40 +08:00
fanqq	0be17bf2d7	add client body max size	2015-07-09 17:49:20 +08:00
fanqq	ccd38bacfa	update test	2015-07-09 15:36:16 +08:00
fanqq	f0a5eb663c	update	2015-07-09 14:10:48 +08:00
fanqq	a79aeb4662	update	2015-07-09 11:35:45 +08:00
fanqq	611bbed053	add bastion header	2015-07-09 11:05:03 +08:00
fanqq	84e470baf8	update	2015-07-08 17:42:28 +08:00
fanqq	8367db89c1	update 404	2015-07-08 16:55:57 +08:00
fanqq	3ce4ca3910	add 404	2015-07-08 16:35:53 +08:00
fanqq	b4ba8335f1	update	2015-07-08 15:56:27 +08:00
fanqq	30cce14967	update bastion and white list	2015-07-08 15:46:31 +08:00
Mengyi Zhou	0939b5db56	fix up path validation	2015-07-08 14:06:54 +08:00
Mengyi Zhou	f26d94b355	add validation test	2015-07-07 17:34:14 +08:00
fanqq	57a8147807	rm ssl defaultserver ... add member op while group is not Activated	2015-07-07 12:43:28 +08:00
Mengyi Zhou	d8144288b9	return empty list	2015-07-06 14:31:37 +08:00
Mengyi Zhou	a207754641	hot fix	2015-07-03 18:56:47 +08:00
Mengyi Zhou	aa75a82a5b	make parser static	2015-07-03 14:27:09 +08:00
fanqq	31ca9524b3	update test and rewrite parser	2015-07-02 18:32:46 +08:00
fanqq	6dbf7c812e	Merge branch 'github_dev_slbvalidate' into github_dev	2015-07-02 17:02:22 +08:00
fanqq	d0b0e08d1b	update slb validator	2015-07-02 16:54:47 +08:00
fanqq	756815742c	update slb validator	2015-07-02 16:39:30 +08:00
fanqq	0843801a6b	update test	2015-07-01 11:41:22 +08:00
fanqq	da747b51a2	update upstream name	2015-06-30 19:13:59 +08:00
fanqq	9b7b49bb44	update test	2015-06-30 18:13:13 +08:00
fanqq	5b12216e34	update Integration	2015-06-30 17:05:50 +08:00
Mengyi Zhou	4c1c5c792c	add path rewrite validation	2015-06-30 15:37:07 +08:00
Mengyi Zhou	47970ac4a6	small fixup	2015-06-30 15:25:24 +08:00
fanqq	d8d323ad0e	fix dyups bug	2015-06-30 15:06:24 +08:00
Mengyi Zhou	92a4d7d8e0	add slb validator and inject to repositories	2015-06-30 14:29:12 +08:00
fanqq	aafc084643	Merge branch 'github_dev' of https://github.com/ctripcorp/zeus into github_dev	2015-06-30 11:28:52 +08:00
fanqq	3ae9ea73a9	update healthcheck	2015-06-30 11:24:41 +08:00
Mengyi Zhou	9dc57673e2	inject to repositories	2015-06-29 18:51:35 +08:00
Mengyi Zhou	7da00d57ce	add group validator	2015-06-29 18:48:24 +08:00
Mengyi Zhou	b5d29a08ef	Merge branch 'github_dev' into github_dev_slbvalidate	2015-06-29 16:41:08 +08:00