mirror of
https://github.com/ClickHouse/ClickHouse.git
synced 2024-10-12 11:30:49 +00:00
fix incorrect merge
This commit is contained in:
parent
1520fc37e5
commit
262ed4ebc7
@ -1,30 +1,18 @@
|
|||||||
<<<<<<< HEAD
|
|
||||||
## Fixed in ClickHouse Release 1.1.54388, 2018-06-28
|
## Fixed in ClickHouse Release 1.1.54388, 2018-06-28
|
||||||
=======
|
|
||||||
## Fixed in ClickHouse release 1.1.54388, 2018-06-28
|
|
||||||
>>>>>>> cc433d996c4dc331adb8b694a518c4acf769a993
|
|
||||||
|
|
||||||
### CVE-2018-14668
|
### CVE-2018-14668
|
||||||
"remote" table function allowed arbitrary symbols in "user", "password" and "default_database" fields which led to Cross Protocol Request Forgery Attacks.
|
"remote" table function allowed arbitrary symbols in "user", "password" and "default_database" fields which led to Cross Protocol Request Forgery Attacks.
|
||||||
|
|
||||||
Credits: Andrey Krasichkov of Yandex Information Security Team
|
Credits: Andrey Krasichkov of Yandex Information Security Team
|
||||||
|
|
||||||
<<<<<<< HEAD
|
|
||||||
## Fixed in ClickHouse Release 1.1.54390, 2018-07-06
|
## Fixed in ClickHouse Release 1.1.54390, 2018-07-06
|
||||||
=======
|
|
||||||
## Fixed in ClickHouse release 1.1.54390, 2018-07-06
|
|
||||||
>>>>>>> cc433d996c4dc331adb8b694a518c4acf769a993
|
|
||||||
|
|
||||||
### CVE-2018-14669
|
### CVE-2018-14669
|
||||||
ClickHouse MySQL client had "LOAD DATA LOCAL INFILE" functionality enabled that allowed a malicious MySQL database read arbitrary files from the connected ClickHouse server.
|
ClickHouse MySQL client had "LOAD DATA LOCAL INFILE" functionality enabled that allowed a malicious MySQL database read arbitrary files from the connected ClickHouse server.
|
||||||
|
|
||||||
Credits: Andrey Krasichkov and Evgeny Sidorov of Yandex Information Security Team
|
Credits: Andrey Krasichkov and Evgeny Sidorov of Yandex Information Security Team
|
||||||
|
|
||||||
<<<<<<< HEAD
|
|
||||||
## Fixed in ClickHouse Release 1.1.54131, 2017-01-10
|
## Fixed in ClickHouse Release 1.1.54131, 2017-01-10
|
||||||
=======
|
|
||||||
## Fixed in ClickHouse release 1.1.54131, 2017-01-10
|
|
||||||
>>>>>>> cc433d996c4dc331adb8b694a518c4acf769a993
|
|
||||||
|
|
||||||
### CVE-2018-14670
|
### CVE-2018-14670
|
||||||
|
|
||||||
|
@ -170,13 +170,7 @@ pages:
|
|||||||
- 'How to write C++ code': 'development/style.md'
|
- 'How to write C++ code': 'development/style.md'
|
||||||
- 'How to run ClickHouse tests': 'development/tests.md'
|
- 'How to run ClickHouse tests': 'development/tests.md'
|
||||||
|
|
||||||
<<<<<<< HEAD
|
|
||||||
- 'What''s new':
|
- 'What''s new':
|
||||||
- 'Roadmap': 'roadmap.md'
|
- 'Roadmap': 'roadmap.md'
|
||||||
- 'Changelog': 'changelog.md'
|
- 'Changelog': 'changelog.md'
|
||||||
- 'Security changelog': 'security_changelog.md'
|
- 'Security changelog': 'security_changelog.md'
|
||||||
=======
|
|
||||||
- 'Roadmap': 'roadmap.md'
|
|
||||||
- 'Changelog': 'changelog.md'
|
|
||||||
- 'Security changelog': 'security_changelog.md'
|
|
||||||
>>>>>>> cc433d996c4dc331adb8b694a518c4acf769a993
|
|
||||||
|
@ -175,13 +175,7 @@ pages:
|
|||||||
- 'Как писать код на C++': 'development/style.md'
|
- 'Как писать код на C++': 'development/style.md'
|
||||||
- 'Как запустить тесты': 'development/tests.md'
|
- 'Как запустить тесты': 'development/tests.md'
|
||||||
|
|
||||||
<<<<<<< HEAD
|
|
||||||
- 'Что нового':
|
- 'Что нового':
|
||||||
- 'Changelog': 'changelog.md'
|
- 'Changelog': 'changelog.md'
|
||||||
- 'Security changelog': 'security_changelog.md'
|
- 'Security changelog': 'security_changelog.md'
|
||||||
- 'Roadmap': 'roadmap.md'
|
- 'Roadmap': 'roadmap.md'
|
||||||
=======
|
|
||||||
- 'Roadmap': 'roadmap.md'
|
|
||||||
- 'Changelog': 'changelog.md'
|
|
||||||
- 'Security changelog': 'security_changelog.md'
|
|
||||||
>>>>>>> cc433d996c4dc331adb8b694a518c4acf769a993
|
|
||||||
|
Loading…
Reference in New Issue
Block a user