5 Commits

Author SHA1 Message Date
lichengyin
1ed41c91ce Merge branch 'master' into 2.1
* master:
  release 2.0.16
  add context for think.parseConfig

Conflicts:
	package.json
	src/adapter/cache/memcache.js
	src/adapter/cache/redis.js
2016-01-07 19:29:40 +08:00
lichengyin
7e61ac7075 add context for think.parseConfig 2016-01-07 19:23:50 +08:00
lichengyin
c8a1537ed9 fix windows test error 2015-12-17 20:05:38 +08:00
lichengyin
dcebaebfc2 improve test case 2015-11-27 10:17:54 +08:00
lichengyin
c3a08d8ba0 add db session test case 2015-10-27 09:48:44 +08:00