mirror/php-monolog
1
0
Fork 0
mirror of https://github.com/Seldaek/monolog.git synced 2025-08-03 03:37:34 +02:00
Code Issues Releases Wiki Activity

Merge branch '2.x' into main

Browse Source
This commit is contained in:
Jordi Boggiano
2022-05-08 23:50:01 +02:00
parent de11fc39de 354ddc8020
commit 5eca08223d
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/continuous-integration.yml vendored
View File

@@ -32,7 +32,7 @@ jobs:
uses: "actions/checkout@v2" uses: "actions/checkout@v2"
- name: Run CouchDB - name: Run CouchDB
timeout-minutes: 1 timeout-minutes: 3
continue-on-error: true continue-on-error: true
uses: "cobot/couchdb-action@master" uses: "cobot/couchdb-action@master"
with: with:
@@ -114,7 +114,7 @@ jobs:
sudo sysctl -w vm.max_map_count=262144 sudo sysctl -w vm.max_map_count=262144
- name: Run Elasticsearch - name: Run Elasticsearch
timeout-minutes: 1 timeout-minutes: 3
uses: elastic/elastic-github-actions/elasticsearch@master uses: elastic/elastic-github-actions/elasticsearch@master
with: with:
stack-version: "${{ matrix.es-version }}" stack-version: "${{ matrix.es-version }}"

4
CHANGELOG.md
View File

@@ -1,7 +1,7 @@
### 2.5.0 (2022-04-08) ### 2.5.0 (2022-04-08)
* Added `callType` to IntrospectionProcessor (#1612) * Added `callType` to IntrospectionProcessor (#1612)
* Fixed AsMonologProcessor syntax to be compatible with PHP 7.2 (#1651) * Fixed AsMonologProcessor syntax to be compatible with PHP 7.2 (#1651)
### 2.4.0 (2022-03-14) ### 2.4.0 (2022-03-14)