Merge branch 'release/1.5.0' into develop

BryanDonovan · BryanDonovan · commit 16f9388e04a9 · 2016-03-13T14:22:24.000-07:00
diff --git a/History.md b/History.md
@@ -1,3 +1,6 @@
+- 1.5.0 2015-03-13
+  -npm bumps, making sure global.Promise is not defined in node 0.10 memory store test.
+
 - 1.4.1 2016-03-13
   - Fixing backward-compatibility Promise issue with node 0.10.x in memory store.
 
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cache-manager",
-  "version": "1.4.1",
+  "version": "1.5.0",
   "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": "1.4.1",`
	`3`	`+ "version": "1.5.0",`
`4`	`4`	`"description": "Cache module for Node.js",`
`5`	`5`	`"main": "index.js",`
`6`	`6`	`"scripts": {`