e-cloud 02d6c017f4 Merge branch 'master' ...

Conflicts:
	.travis.yml
	lib/appenders/dateFile.js
	lib/appenders/file.js
	lib/appenders/fileSync.js
	lib/appenders/gelf.js
	lib/appenders/logFacesAppender.js
	lib/date_format.js
	lib/debug.js
	lib/layouts.js
	lib/log4js.js
	lib/log4js.json
	lib/logger.js
	lib/streams/BaseRollingFileStream.js
	lib/streams/DateRollingFileStream.js
	lib/streams/RollingFileStream.js
	lib/streams/index.js
	package.json
	test/layouts-test.js
	test/streams/BaseRollingFileStream-test.js
	test/streams/DateRollingFileStream-test.js
	test/streams/rollingFileStream-test.js

2016-12-12 17:42:34 +08:00

..

appenders

Merge branch 'master'

2016-12-12 17:42:34 +08:00

connect-logger.js

Merge remote-tracking branch 'refs/remotes/upstream/master'

2016-07-18 15:50:52 +08:00

date_format.js

Merge branch 'master'

2016-12-12 17:42:34 +08:00

layouts.js

Merge branch 'master'

2016-12-12 17:42:34 +08:00

levels.js

refactor: level.js

2016-07-14 22:06:01 +08:00

log4js.js

Merge branch 'master'

2016-12-12 17:42:34 +08:00

logger.js

Merge branch 'master'

2016-12-12 17:42:34 +08:00