Skip to content

Commit b1c8ffa

Browse files
committed
Merge branch '8.x'
# Conflicts: # CHANGELOG.md
2 parents 501766f + 454f0e1 commit b1c8ffa

File tree

2 files changed

+9
-1
lines changed

2 files changed

+9
-1
lines changed

CHANGELOG.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
# Release Notes
22

3-
## [Unreleased](https://github.com/laravel/laravel/compare/v8.5.5...master)
3+
## [Unreleased](https://github.com/laravel/laravel/compare/v8.5.6...master)
4+
5+
6+
## [v8.5.6 (2020-12-22)](https://github.com/laravel/laravel/compare/v8.5.5...v8.5.6)
7+
8+
### Added
9+
- Add `lock_connection` ([](https://github.com/laravel/laravel/commit/bc339f712389cf536ad7e340453f35d1dd865777), [e8788a7](https://github.com/laravel/laravel/commit/e8788a768899ff2a2ef1fe78e24b46e6e10175dc))
410

511

612
## [v8.5.5 (2020-12-12)](https://github.com/laravel/laravel/compare/v8.5.4...v8.5.5)

config/cache.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@
4646
'driver' => 'database',
4747
'table' => 'cache',
4848
'connection' => null,
49+
'lock_connection' => null,
4950
],
5051

5152
'file' => [
@@ -75,6 +76,7 @@
7576
'redis' => [
7677
'driver' => 'redis',
7778
'connection' => 'cache',
79+
'lock_connection' => 'default',
7880
],
7981

8082
'dynamodb' => [

0 commit comments

Comments
 (0)