Sync with laravel

This commit is contained in:
Graham Campbell
2016-03-24 15:21:02 +00:00
parent bca7c5340a
commit 1438783c07
5 changed files with 16 additions and 16 deletions

View File

@@ -60,7 +60,9 @@ return [
'driver' => 'memcached',
'servers' => [
[
'host' => '127.0.0.1', 'port' => 11211, 'weight' => 100,
'host' => '127.0.0.1',
'port' => 11211,
'weight' => 100,
],
],
],

View File

@@ -57,11 +57,10 @@ return [
'root' => storage_path().'/app',
],
'ftp' => [
'driver' => 'ftp',
'host' => 'ftp.example.com',
'username' => 'your-username',
'password' => 'your-password',
'public' => [
'driver' => 'local',
'root' => storage_path('app/public'),
'visibility' => 'public',
],
's3' => [
@@ -72,16 +71,6 @@ return [
'bucket' => 'your-bucket',
],
'rackspace' => [
'driver' => 'rackspace',
'username' => 'your-username',
'key' => 'your-key',
'container' => 'your-container',
'endpoint' => 'https://identity.api.rackspacecloud.com/v2.0/',
'region' => 'IAD',
'url_type' => 'publicURL',
],
],
];