4 Commits

Author	SHA1	Message	Date
Tan Jiang	7f55520b27	Merge remote-tracking branch 'upstream/dev' into dev	2016-10-28 22:44:59 +08:00
Tan Jiang	b75844e622	update ciphers for nginx	2016-10-28 18:48:12 +08:00
Wenkai Yin	0689935da4	log rotate	2016-10-26 18:26:02 +08:00
yhua	311cf8da07	change code 20161019	2016-10-21 18:39:10 +08:00