11 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
Daniel Jiang	098643303f	Merge pull request #952 from ywk253100/161026_log_rotate ... Log rotate	2016-10-28 12:59:54 +08:00
Wenkai Yin	0689935da4	log rotate	2016-10-26 18:26:02 +08:00
yhua	a6e7a6ba45	fix baseimage issue	2016-10-26 13:46:22 +08:00
yhua	03e2a3ee56	remove tag in docker-compose.yml	2016-10-26 13:09:12 +08:00
yhua	271787dd94	update for fix #925	2016-10-24 16:51:42 +08:00
yhua	ebc852b7cc	fix #924 #925	2016-10-24 16:48:48 +08:00
yhua	1043ec063d	rm binary	2016-10-24 14:18:56 +08:00
yhua	69797c30f2	fix pushimage, update .gitignore, add DEVFLAG	2016-10-24 14:06:23 +08:00
yhua	311cf8da07	change code 20161019	2016-10-21 18:39:10 +08:00