309 commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
fanqq	2ee2652a37	Merge branch 'module_dev' into ctrip_module_dev	2015-04-13 18:36:40 +08:00
fanqq	ea1f83c53c	fix bug （appslb is not include appname in the previous versions）	2015-04-13 18:34:32 +08:00
fanqq	0856a4c068	add IntegrationTest file	2015-04-13 17:58:53 +08:00
fanqq	02623bb7c1	delete a test file	2015-04-13 17:58:13 +08:00
fanqq	8c294e4997	add integration test and fix bug （app&slb delete）	2015-04-13 17:26:21 +08:00
fanqq	61a5254645	add activate status snapshot	2015-04-10 14:39:25 +08:00
fanqq	86e4898da0	add ops requirements	2015-04-08 14:05:03 +08:00
Mengyi Zhou	f7f4370873	Merge branch 'module_dev' of https://github.com/ctripcorp/zeus into module_dev	2015-04-07 18:51:49 +08:00
Mengyi Zhou	030f3db9ca	improve validation	2015-04-07 18:50:09 +08:00
fanqq	dc7c6cac90	add validate	2015-04-07 18:38:23 +08:00
fanqq	8fcd8f359f	Merge branch 'module_dev' of https://github.com/ctripcorp/zeus into module_dev	2015-04-07 16:53:42 +08:00
fanqq	0156a93243	fix bug and add test	2015-04-07 16:53:10 +08:00
Mengyi Zhou	293e62c524	return null instead of DalNotFoundException	2015-04-03 17:59:54 +08:00
Mengyi Zhou	e931cacafd	clean code	2015-04-03 16:41:00 +08:00
fanqq	a199b9f160	Merge branch 'module_dev' of https://github.com/ctripcorp/zeus into module_dev	2015-04-03 15:48:37 +08:00
fanqq	c3b1bb6e20	add TestCase	2015-04-03 15:46:43 +08:00
Mengyi Zhou	f5364be740	refine code	2015-04-03 13:54:41 +08:00
Mengyi Zhou	d01cfe0b24	add exception aspect	2015-04-02 19:13:13 +08:00
mag	8a0a7f5054	Throw out exception in resource and fix colocate nginx url	2015-04-02 17:02:23 +08:00
fanqq	f8a2559816	Merge branch 'module_dev' of https://github.com/ctripcorp/zeus into module_dev	2015-04-02 13:41:03 +08:00
mag	527473d0c6	Merge branch 'module_dev' of https://github.com/ctripcorp/zeus into module_dev	2015-04-02 11:14:43 +08:00
mag	35ef02b0ef	add app service interface	2015-04-02 10:31:03 +08:00
fanqq	9a6f50f6a4	Merge branch 'module_dev' of https://github.com/ctripcorp/zeus into module_dev	2015-04-02 09:59:10 +08:00
fanqq	bc05566dec	add test and change app.jsp	2015-04-02 09:57:48 +08:00
Mengyi Zhou	5368c824c1	sync app and slb after add/update	2015-04-01 18:53:45 +08:00
mag	09d960f01b	Merge branch 'module_dev' of https://github.com/ctripcorp/zeus into module_dev	2015-04-01 10:43:50 +08:00
fanqq	b2b9cde67b	Merge branch 'module_dev' of https://github.com/ctripcorp/zeus into module_dev	2015-04-01 10:34:12 +08:00
fanqq	a8b04eacb8	add test for activate api	2015-04-01 10:32:07 +08:00
Mengyi Zhou	200a5631ce	get archive max version bug fix	2015-04-01 09:58:03 +08:00
mag	d9f482a1cc	Merge branch 'module_dev' of https://github.com/ctripcorp/zeus into module_dev	2015-03-31 16:35:13 +08:00
fanqq	41de2462e8	change api path	2015-03-31 16:34:06 +08:00
mag	b135b58441	Merge branch 'module_dev' of https://github.com/ctripcorp/zeus into module_dev	2015-03-31 16:29:11 +08:00
fanqq	acee7721da	add activate service and statusservice	2015-03-31 16:26:33 +08:00
mag	ba550f9604	merge branch for nginx integration	2015-03-31 16:07:04 +08:00
fanqq	4ee31ad02e	unstaged 3.31	2015-03-31 13:24:28 +08:00
Mengyi Zhou	23b5fc8097	add appName attribute to AppSlb	2015-03-31 12:40:20 +08:00
Mengyi Zhou	d19f0a6905	new requirements	2015-03-30 18:19:02 +08:00
Mengyi Zhou	5347fbe79a	listByAppServerAndAppName allows null param, expose ArchiveService	2015-03-30 16:15:40 +08:00
mag	666f0f0927	Add nginx service implementation	2015-03-30 13:52:51 +08:00
Mengyi Zhou	2f2f418776	modify test case	2015-03-30 13:21:36 +08:00
Mengyi Zhou	94269ed544	fixup after rebase	2015-03-30 11:34:49 +08:00
Mengyi Zhou	2661700c9e	update package layout	2015-03-30 11:34:48 +08:00
Mengyi Zhou	54173a0307	update test	2015-03-30 11:34:48 +08:00
Mengyi Zhou	4796ae0cef	add more service intfs	2015-03-30 11:34:47 +08:00
Mengyi Zhou	e759337362	fixup! slb api & service dev	2015-03-30 11:34:46 +08:00
Mengyi Zhou	e4e51fb66c	throw ex	2015-03-30 11:34:46 +08:00
Mengyi Zhou	93e0d198de	add delete api	2015-03-30 11:34:45 +08:00
Mengyi Zhou	625614166c	correct result	2015-03-30 11:34:45 +08:00
Mengyi Zhou	e7a23ae582	rename test	2015-03-30 11:34:44 +08:00
Mengyi Zhou	6e426da587	add app delete and testcases	2015-03-30 11:34:44 +08:00