Merge branch 'release/0.17.0' into develop

BryanDonovan · BryanDonovan · commit 14fa7f4506de · 2015-02-05T11:07:22.000-08:00
diff --git a/History.md b/History.md
@@ -1,3 +1,7 @@
+- 0.17.0 2015-02-05
+  Add Additional Options Parameter (#20) - @seanzx85
+  Fixing bug with nested calls to wrap() (#21)
+
 - 0.16.0 2015-01-07
   Get and pass up feature to update higher caches. (#19) - raadad
   Minor style tweaks/jscs update.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cache-manager",
-  "version": "0.16.0",
+  "version": "0.17.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": "0.16.0",`
	`3`	`+ "version": "0.17.0",`
`4`	`4`	`"description": "Cache module for Node.js",`
`5`	`5`	`"main": "index.js",`
`6`	`6`	`"scripts": {`