256 commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Mengyi Zhou	eb449e12fa	integrate sso to app & slb resource	2015-04-29 15:55:44 +08:00
fanqq	a1b6f9cd08	add version check before dyops	2015-04-29 15:37:54 +08:00
fanqq	63b2ee4069	update updown member lock	2015-04-29 14:12:41 +08:00
fanqq	ec0d100a0e	add auth requirement to activate&server Resource	2015-04-29 13:45:07 +08:00
mag	d1076a3db6	integrate sso and authorization part	2015-04-29 12:59:31 +08:00
mag	95626bf0bd	SSO integration	2015-04-29 12:56:25 +08:00
mag	d66af5a8ac	Add role management api for zeus	2015-04-29 12:56:24 +08:00
mag	b6c648b847	init commit for spring security integration	2015-04-29 12:55:30 +08:00
fanqq	964deb5147	update lock	2015-04-29 11:23:41 +08:00
fanqq	043990e9da	add build lock and write&reload lock and LocalClient sync	2015-04-29 11:13:35 +08:00
fanqq	2d3f64b115	Merge branch 'github_dev' of https://github.com/ctripcorp/zeus into github_dev	2015-04-29 10:23:28 +08:00
fanqq	fead82fe56	add x-forward-for to location config	2015-04-29 09:56:40 +08:00
Mengyi Zhou	f637ac11cc	update lock	2015-04-28 20:05:30 +08:00
fanqq	e97d32bd2f	update writetodisk function , optimize build ticket ,update dyups interface	2015-04-28 19:51:49 +08:00
fanqq	b36fdaf0c9	add version compare (write and load)	2015-04-28 15:51:47 +08:00
Mengyi Zhou	28e8383b8c	add lock to update	2015-04-28 11:28:15 +08:00
fanqq	89fb5a3a92	rm uat datasource.xml and update gitignore	2015-04-27 17:38:18 +08:00
fanqq	09ca7f55f0	git hub add gitignore and gitattributes	2015-04-27 15:32:41 +08:00
Mengyi Zhou	9e5c493171	Merge branch 'lock' into github_dev	2015-04-24 14:15:22 +08:00
Mengyi Zhou	1b4ca05744	code cleansing	2015-04-24 14:11:44 +08:00
Mengyi Zhou	522322bd6f	modify impl	2015-04-24 14:11:43 +08:00
Mengyi Zhou	0e974e0a14	update interface	2015-04-24 14:11:42 +08:00
Mengyi Zhou	5248ba0df6	add lock owner	2015-04-24 14:11:42 +08:00
Mengyi Zhou	993122c39f	add lock status api	2015-04-24 14:11:41 +08:00
Mengyi Zhou	19f02014f5	add lock	2015-04-24 14:11:40 +08:00
fanqq	e20c2c690a	Merge branch 'dyups' into github_dev	2015-04-23 17:47:01 +08:00
fanqq	3e977ac649	add dyups to project and fix something bugs	2015-04-23 17:03:42 +08:00
fanqq	e7b26a0570	Merge branch 'github_dev' into ctrip_module_dev	2015-04-23 17:02:28 +08:00
Mengyi Zhou	1988d89fda	try parse req using json when mediatype is unknown	2015-04-23 16:57:14 +08:00
fanqq	d73b6d1196	fix config change error	2015-04-23 16:14:31 +08:00
fanqq	483ed009c4	ctrip commit config change	2015-04-23 16:14:13 +08:00
Mengyi Zhou	f1d25937db	fix get max version bug	2015-04-22 16:23:49 +08:00
mag	9f857a851d	Fix to add port in the app server status	2015-04-20 17:05:30 +08:00
Mengyi Zhou	0ba42080da	update exception message	2015-04-17 17:09:10 +08:00
fanqq	0e65514693	Merge branch 'module_dev' of https://github.com/ctripcorp/zeus into module_dev	2015-04-16 17:30:17 +08:00
fanqq	9e3d9dae26	format	2015-04-16 17:29:55 +08:00
Mengyi Zhou	d0072df419	Merge branch 'hotfix_slb_addvip' into module_dev	2015-04-16 14:24:53 +08:00
Mengyi Zhou	ea99b0836d	add slb vip info to app model	2015-04-16 12:29:23 +08:00
mag	a3d8893bb4	Fix bug for fetch app status restful api	2015-04-15 19:10:36 +08:00
fanqq	5e82becef1	add test report	2015-04-15 16:13:25 +08:00
fanqq	41648d55fa	fix	2015-04-15 14:17:03 +08:00
fanqq	79eb4de0f5	update test case	2015-04-14 17:00:51 +08:00
Mengyi Zhou	a350e3017a	add update integration test	2015-04-14 14:18:03 +08:00
Mengyi Zhou	977e92c3a0	reformat	2015-04-14 11:24:31 +08:00
fanqq	6586d94cc3	fix test case bug	2015-04-14 10:20:26 +08:00
fanqq	2742bce6c9	fix test case bug	2015-04-13 19:02:50 +08:00
fanqq	0883bcdd01	fix	2015-04-13 18:47:07 +08:00
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