60 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
macfx	593d3eb5d0	dev	2015-03-13 20:57:48 +08:00
xingchaowang	70e6d3dbfb	dev	2015-03-13 15:48:27 +08:00
xingchaowang	044ca4015a	dev	2015-03-12 22:32:47 +08:00
xingchaowang	107c098277	add kill.exe	2015-03-12 20:34:41 +08:00
xingchaowang	fe15b17a69	unit tests	2015-03-12 18:47:19 +08:00
xingchaowang	001c0a0681	tests	2015-03-12 17:38:49 +08:00
xingchaowang	015b53b520	Merge branch 'dev' of github.com:ctripcorp/zeus into dev	2015-03-12 13:17:36 +08:00
xingchaowang	2844a72dae	pom	2015-03-12 13:17:28 +08:00
xingchaowang	4d7fdcb862	Merge branch 'dev' of git.dev.sh.ctripcorp.com:framework/slb into dev	2015-03-12 11:11:15 +08:00
xingchaowang	5e602f8761	dev	2015-03-12 11:09:26 +08:00
macfx	d53a9acc2c	dev	2015-03-12 01:39:33 +08:00
xingchaowang	88a9c783ae	dev	2015-03-11 22:41:10 +08:00
Frankie Wu	e7b2c077eb	upgrade plexus plugin version	2015-03-11 21:42:33 +08:00
Frankie Wu	7d60580700	update README.md	2015-03-11 21:02:37 +08:00
Frankie Wu	dc981e4a71	update README.md	2015-03-11 20:59:36 +08:00
Frankie Wu	cdd09999ff	add travis CI	2015-03-11 20:55:15 +08:00
xingchaowang	65e674eb5c	add NginxConf	2015-03-11 16:13:46 +08:00
xingchaowang	93723710db	dev	2015-03-11 14:08:22 +08:00
xingchaowang	f29d7388ce	healthcheck	2015-03-11 14:05:19 +08:00
xingchaowang	f6f7f3a020	dev	2015-03-10 22:30:41 +08:00
xingchaowang	834fc35a79	fixbug: error port	2015-03-10 22:22:01 +08:00
xingchaowang	7a083e4218	remove health_check	2015-03-10 22:04:24 +08:00
xingchaowang	98993e8da6	remove zone directive	2015-03-10 21:57:09 +08:00
xingchaowang	571213a4a9	fixbug: lb method	2015-03-10 21:48:50 +08:00
xingchaowang	6875f0d8f5	refactor: datasoruce conf loading	2015-03-10 21:41:56 +08:00
xingchaowang	c2a1ff5236	fixbug:nginx conf	2015-03-10 21:17:32 +08:00
xingchaowang	05f2053ae4	support transaction and add tests	2015-03-10 15:21:03 +08:00
xingchaowang	3e9204815e	fixbug	2015-03-09 21:30:59 +08:00
xingchaowang	a8f44bc517	remove an import	2015-03-09 16:43:00 +08:00
xingchaowang	688d6bbc29	add compiler plugin	2015-03-09 16:40:11 +08:00
xingchaowang	66bbf4f294	refactor nginx conf	2015-03-09 16:11:07 +08:00
xingchaowang	32ac021a17	NginxConf	2015-03-09 15:56:14 +08:00
xingchaowang	80c90b25f2	dev	2015-03-08 22:31:12 +08:00
xingchaowang	7323a5b7ed	dev	2015-03-08 16:45:06 +08:00
xingchaowang	d5dec8a736	api	2015-03-07 22:08:04 +08:00
xingchaowang	26b73e0258	add app	2015-03-07 21:21:28 +08:00
xingchaowang	67aa4ca5bf	add app	2015-03-07 21:17:02 +08:00
xingchaowang	d624aca5d7	slb	2015-03-07 17:31:58 +08:00
xingchaowang	c2cecaa0e5	dev	2015-03-07 16:59:05 +08:00
xingchaowang	6e3d267f03	slb persistent	2015-03-07 15:13:22 +08:00
xingchaowang	d4e4dac9ea	add DbSync	2015-03-07 13:25:22 +08:00
xingchaowang	b505091abc	refactor	2015-03-07 12:20:28 +08:00
xingchaowang	265ea0733a	day dev	2015-03-06 22:39:22 +08:00
xingchaowang	7e42bc17be	auto generate dao-beans.xml	2015-03-06 16:29:09 +08:00
xingchaowang	1e546e7413	day dev checkpoint	2015-03-05 22:37:46 +08:00
xingchaowang	1e3e8fcc36	create model and tables	2015-03-05 22:21:43 +08:00
xingchaowang	2aa82609b6	Integrate spring and dal	2015-03-05 18:41:54 +08:00
xingchaowang	02a75549bc	dev	2015-03-05 18:07:22 +08:00
xingchaowang	ccb53b6e6e	test package and distribution	2015-03-05 17:43:30 +08:00
xingchaowang	926cb01a52	support jsp	2015-03-05 17:01:21 +08:00