Skip to content

Commit 018d836

Browse files
Merge branch '4.4' into 5.1
* 4.4: [Cache] fix setting "read_timeout" when using Redis Fix CS in changelogs
2 parents cb3d5f9 + 21b7477 commit 018d836

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

CHANGELOG.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,6 @@ CHANGELOG
170170
* added `TaggedIteratorArgument` with YAML (`!tagged foo`) and XML (`<service type="tagged"/>`) support
171171
* deprecated `AutowireExceptionPass` and `AutowirePass::getAutowiringExceptions()`, use `Definition::addError()` and the `DefinitionErrorExceptionPass` instead
172172

173-
174173
3.3.0
175174
-----
176175

@@ -239,8 +238,8 @@ CHANGELOG
239238
2.5.0
240239
-----
241240

242-
* added DecoratorServicePass and a way to override a service definition (Definition::setDecoratedService())
243-
* deprecated SimpleXMLElement class.
241+
* added DecoratorServicePass and a way to override a service definition (Definition::setDecoratedService())
242+
* deprecated SimpleXMLElement class.
244243

245244
2.4.0
246245
-----

0 commit comments

Comments
 (0)