Merge branch 'release/2.0.1'

BryanDonovan · BryanDonovan · commit 5620da9ba111 · 2016-04-18T09:49:42.000-07:00
diff --git a/History.md b/History.md
@@ -1,7 +1,10 @@
-- 2.0.0 2015-03-13
+- 2.0.1 2016-04-18
+  - Fixed triggering callback in wrap after it was queued (#48) - @theorm
+
+- 2.0.0 2016-03-13
   - Removing domain integration (#38), no longer actively supporting node 0.10.x.
 
-- 1.5.0 2015-03-13
+- 1.5.0 2016-03-13
   - npm bumps, making sure global.Promise is not defined in node 0.10 memory store test.
 
 - 1.4.1 2016-03-13
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cache-manager",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "description": "Cache module for Node.js",
   "main": "index.js",
   "scripts": {

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "cache-manager",`
`3`		`- "version": "2.0.0",`
	`3`	`+ "version": "2.0.1",`
`4`	`4`	`"description": "Cache module for Node.js",`
`5`	`5`	`"main": "index.js",`
`6`	`6`	`"scripts": {`