From ce009c74dda1b32545ea52f27686e53ff54fe7ad Mon Sep 17 00:00:00 2001 From: Kevin MacMartin Date: Wed, 24 Aug 2016 12:09:21 -0400 Subject: [PATCH] Pull in latest laravel upstream changes --- .laravel-commit | 2 +- config/cache.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.laravel-commit b/.laravel-commit index 8c60672..5eeefa5 100644 --- a/.laravel-commit +++ b/.laravel-commit @@ -1 +1 @@ -f5dfa2057e800e15ecc1f5609016dfbc08fc643e +362383d7c59555002806cd9b8ec7ec1368dc24db diff --git a/config/cache.php b/config/cache.php index 272841b..0581207 100644 --- a/config/cache.php +++ b/config/cache.php @@ -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' => [