Merge branch '2.1' into 2.2

orchestral · Oct 7, 2014 · 4d6a93f · 4d6a93f
2 parents 07bfd61 + 8bb0d05
commit 4d6a93f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/fixture/app/config/cache.php b/src/fixture/app/config/cache.php
@@ -15,7 +15,7 @@
 	|
 	*/
 
-	'driver' => 'file',
+	'driver' => 'array',
 
 	/*
 	|--------------------------------------------------------------------------

diff --git a/src/fixture/app/config/session.php b/src/fixture/app/config/session.php
@@ -11,12 +11,12 @@
 	| requests. By default, we will use the lightweight native driver but
 	| you may specify any of the other wonderful drivers provided here.
 	|
-	| Supported: "file", "cookie", "database", "apc",
+	| Supported: "native", "cookie", "database", "apc",
 	|            "memcached", "redis", "array"
 	|
 	*/
 
-	'driver' => 'file',
+	'driver' => 'array',
 
 	/*
 	|--------------------------------------------------------------------------
@@ -29,9 +29,9 @@
 	|
 	*/
 
-	'lifetime' => 120,
+	// 'lifetime' => 120,
 
-	'expire_on_close' => false,
+	// 'expire_on_close' => false,
 
 	/*
 	|--------------------------------------------------------------------------