Pull in latest laravel upstream changes

This commit is contained in:
Kevin MacMartin 2016-08-24 12:09:21 -04:00
parent 81842245d1
commit ce009c74dd
2 changed files with 3 additions and 3 deletions

View file

@ -1 +1 @@
f5dfa2057e800e15ecc1f5609016dfbc08fc643e
362383d7c59555002806cd9b8ec7ec1368dc24db

View file

@ -52,11 +52,11 @@ return [
'memcached' => [
'driver' => 'memcached',
'persistent_id' => env('MEMCACHED_PERSISTENT_ID'),
'sasl' => [
'sasl' => [
env('MEMCACHED_USERNAME'),
env('MEMCACHED_PASSWORD'),
],
'options' => [
'options' => [
// Memcached::OPT_CONNECT_TIMEOUT => 2000,
],
'servers' => [