[PR #295] [MERGED] Merge branch release/v6.0.0 into develop #535

Closed
opened 2026-02-26 10:32:59 +03:00 by kerem · 0 comments
Owner

📋 Pull Request Information

Original PR: https://github.com/ONLYOFFICE/Docker-DocumentServer/pull/295
Author: @papacarlo
Created: 9/30/2020
Status: Merged
Merged: 9/30/2020
Merged by: @papacarlo

Base: developHead: release/v6.0.0


📝 Commits (7)

  • 7bfe250 Add Graphite (#265)
  • 0d974b9 Merge branch hotfix/v5.6.0 into release/v6.0.0
  • c47a310 Fix unary operator expected (Bug 45985) (#270)
  • ac0c135 Merge branch hotfix/v5.6.1 into release/v6.0.0
  • ee12687 Merge branch hotfix/v5.6.2 into release/v6.0.0
  • d3e5246 Merge branch hotfix/v5.6.4 into release/v6.0.0
  • ecb77dd Add more travis tests (#289)

📊 Changes

11 files changed (+131 additions, -15 deletions)

View changed files

📝 .travis.yml (+63 -9)
📝 README.md (+4 -0)
📝 run-document-server.sh (+18 -0)
📝 tests/activemq.yml (+1 -1)
tests/graphite.yml (+32 -0)
tests/graphite/statsd/config.js (+7 -0)
📝 tests/mariadb.yml (+1 -1)
📝 tests/mysql.yml (+2 -1)
📝 tests/postgres.yml (+1 -1)
📝 tests/rabbitmq.yml (+1 -1)
📝 tests/redis.yml (+1 -1)

📄 Description

No description provided


🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.

## 📋 Pull Request Information **Original PR:** https://github.com/ONLYOFFICE/Docker-DocumentServer/pull/295 **Author:** [@papacarlo](https://github.com/papacarlo) **Created:** 9/30/2020 **Status:** ✅ Merged **Merged:** 9/30/2020 **Merged by:** [@papacarlo](https://github.com/papacarlo) **Base:** `develop` ← **Head:** `release/v6.0.0` --- ### 📝 Commits (7) - [`7bfe250`](https://github.com/ONLYOFFICE/Docker-DocumentServer/commit/7bfe2500359c24c6e364f8b35e9089b84c06b1b5) Add Graphite (#265) - [`0d974b9`](https://github.com/ONLYOFFICE/Docker-DocumentServer/commit/0d974b9f2aa8815a93bd1027a15509dde709ce86) Merge branch hotfix/v5.6.0 into release/v6.0.0 - [`c47a310`](https://github.com/ONLYOFFICE/Docker-DocumentServer/commit/c47a31068330ae67b352e539223327cff99ccd8a) Fix unary operator expected (Bug 45985) (#270) - [`ac0c135`](https://github.com/ONLYOFFICE/Docker-DocumentServer/commit/ac0c135dedbc581b8cb0697a56887f79a0336d50) Merge branch hotfix/v5.6.1 into release/v6.0.0 - [`ee12687`](https://github.com/ONLYOFFICE/Docker-DocumentServer/commit/ee126870b217ab62edc6775a5802cf4f52ca46dd) Merge branch hotfix/v5.6.2 into release/v6.0.0 - [`d3e5246`](https://github.com/ONLYOFFICE/Docker-DocumentServer/commit/d3e5246e9a0b41925658d486e817df9b707d987a) Merge branch hotfix/v5.6.4 into release/v6.0.0 - [`ecb77dd`](https://github.com/ONLYOFFICE/Docker-DocumentServer/commit/ecb77ddb56665b9ff3dbb46b5568aea3df5a50bd) Add more travis tests (#289) ### 📊 Changes **11 files changed** (+131 additions, -15 deletions) <details> <summary>View changed files</summary> 📝 `.travis.yml` (+63 -9) 📝 `README.md` (+4 -0) 📝 `run-document-server.sh` (+18 -0) 📝 `tests/activemq.yml` (+1 -1) ➕ `tests/graphite.yml` (+32 -0) ➕ `tests/graphite/statsd/config.js` (+7 -0) 📝 `tests/mariadb.yml` (+1 -1) 📝 `tests/mysql.yml` (+2 -1) 📝 `tests/postgres.yml` (+1 -1) 📝 `tests/rabbitmq.yml` (+1 -1) 📝 `tests/redis.yml` (+1 -1) </details> ### 📄 Description _No description provided_ --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
kerem 2026-02-26 10:32:59 +03:00
Sign in to join this conversation.
No milestone
No project
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
starred/Docker-DocumentServer-ONLYOFFICE#535
No description provided.