thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-18 05:32:52 +00:00
Code Issues Packages Projects Releases Wiki Activity
49,131 Commits 9,136 Branches 1,774 Tags 2 GiB
cb8d132cca
Commit Graph

530 Commits

Author SHA1 Message Date
Azat Khuzhin
ad7379a37e Improve error message on unknown packet for client suggestion 2020-08-17 21:38:34 +03:00
Azat Khuzhin
13f6af3834 Improve error message on unknown packet in client 2020-08-17 21:38:34 +03:00
Vitaly Baranov
0759dff12b Support <user_directories> section in the main config. 2020-08-16 19:15:38 +03:00
Vitaly Baranov
2909ed1bc0 Better initialization of access storages. Make list of access storages dynamic. 2020-08-16 19:15:34 +03:00
Alexey Milovidov
e43746395e Merge branch 'master' into codespell-2 2020-08-16 14:57:21 +03:00
Alexander Tokmakov
128b19fdba Merge branch 'master' into use_atomic_engine_for_system_db 2020-08-14 13:47:44 +03:00
Amos Bird
fe6696390c
Fix shared build 2020-08-14 10:49:40 +08:00
Alexey Milovidov
f5b8f508f0 Better 2020-08-14 05:42:23 +03:00
Alexey Milovidov
2359759b0e Better 2020-08-14 05:35:42 +03:00
Alexey Milovidov
cd095b7671 Fix data visible data clobbering with progress bar in client in interactive mode 2020-08-14 05:19:25 +03:00
Alexander Tokmakov
d1ef34adff fix 2020-08-13 22:41:06 +03:00
Alexander Tokmakov
a6ff049eec use Atomic for system database 2020-08-12 23:40:13 +03:00
Alexey Milovidov
e65a59c400 Added comments 2020-08-12 01:49:38 +03:00
Alexey Milovidov
cb031d3548 Minor changes 2020-08-12 01:48:25 +03:00
Alexey Milovidov
c6428f851a Minor fixes in clickhouse install 2020-08-12 01:04:38 +03:00
Alexey Milovidov
42ecf91df1 Fix "Arcadia" build 2020-08-11 00:36:49 +03:00
Alexey Milovidov
09d30a3699 Attempt to fix "Arcadia" build 2020-08-10 06:26:23 +03:00
Alexey Milovidov
c7a6a18a75 Preparation to enable clickhouse install on Mac and FreeBSD 2020-08-10 02:58:09 +03:00
Alexey Milovidov
361417bea1 Fix "split" build 2020-08-10 02:18:07 +03:00
Alexey Milovidov
1e04014a71 Fix build 2020-08-09 23:10:51 +03:00
Alexey Milovidov
4129ad5bbf Merge branch 'embed-configs' into clickhouse-install 2020-08-09 05:17:12 +03:00
Alexey Milovidov
aa3b4bbfe0 Fix build 2020-08-09 05:16:55 +03:00
Alexey Milovidov
73c8e2c8bd Fix shadow 2020-08-09 05:13:56 +03:00
Alexey Milovidov
8d616444e4 Support for AArch64 2020-08-09 02:54:38 +03:00
Alexey Milovidov
0eac2d4054 Merge branch 'embed-configs' into clickhouse-install 2020-08-09 02:42:06 +03:00
Alexey Milovidov
182e2929f3 Merge branch 'master' into embed-configs 2020-08-09 02:41:44 +03:00
Alexey Milovidov
f459640269 Fix build 2020-08-09 02:41:34 +03:00
alexey-milovidov
4ef51d685a
Merge pull request #13423 from ClickHouse/aku/fuzz-create 
Do not fuzz CREATE queries
 2020-08-09 01:40:06 +03:00
Alexey Milovidov
e5c3f47c92 Added start/stop/status/restart commands 2020-08-08 23:42:10 +03:00
Alexey Milovidov
d9db0a3442 Add simple "clickhouse-install" tool 2020-08-08 21:38:34 +03:00
Alexey Milovidov
6c4df0f27a Better tool 2020-08-08 17:10:49 +03:00
Alexey Milovidov
0f79eb3cc5 Embed configs into binary 2020-08-08 06:42:42 +03:00
Alexey Milovidov
0cbbe153cd Fix typos, the last 1% 2020-08-08 04:21:04 +03:00
Vitaly Baranov
1a4a8a219c
Merge pull request #13305 from vitlibar/correct-error-message-if-setting-not-found-in-users_xml 
Correct error message if setting not found in users.xml
 2020-08-07 23:31:23 +03:00
Alexander Kuzmenkov
ae47579f58 Merge remote-tracking branch 'origin/master' into aku/fuzz-create 2020-08-07 16:11:49 +03:00
alexey-milovidov
9cb0914bbd
Merge pull request #13447 from vladimir-golovchenko/fix-server-gitignore 
Updated gitignore-files.
 2020-08-07 05:01:33 +03:00
vladimir golovchenko
cb153d2605 Updated gitignore-files. 2020-08-06 18:05:32 -07:00
Alexander Kuzmenkov
c32fddbb6d Do not fuzz CREATE queries 
We don't do it anyway, the first unmodified query succeeds and all
others fail. Just make it official.
 2020-08-06 18:40:40 +03:00
Alexander Kuzmenkov
3b1bacf390 Merge remote-tracking branch 'origin/master' into HEAD 2020-08-06 00:15:06 +03:00
Alexander Kuzmenkov
5c2d7fc569 fixes 2020-08-05 18:45:44 +03:00
Alexander Kuzmenkov
d205b20c04 wip 2020-08-05 05:21:33 +03:00
Alexander Kuzmenkov
0b28967ea8 fixup 2020-08-05 02:27:21 +03:00
Alexander Kuzmenkov
fcdfa2a125 Merge remote-tracking branch 'origin/master' into HEAD 2020-08-05 02:25:50 +03:00
Alexey Milovidov
d91471ea00 Merge branch 'master' into stack-frams-size-limit 2020-08-04 15:28:47 +03:00
Vitaly Baranov
a804f9499d Use references while iterating through settings. 2020-08-04 04:00:38 +03:00
Vitaly Baranov
dadebadcac Print correct error message in log for unknown settings in users.xml 2020-08-04 00:20:33 +03:00
Alexander Kuzmenkov
442693dc53 Do not fuzz ASTDictionaryLayout 
+ some cosmetic changes
 2020-08-03 19:16:20 +03:00
Alexey Milovidov
41111d1e57 Merge branch 'master' into stack-frams-size-limit 2020-08-02 19:18:33 +03:00
Alexey Milovidov
778abb346f Merge branch 'master' into merge-tree-settings-sanity-check 2020-08-02 17:13:17 +03:00
Vitaly Baranov
18b21511a9
Merge pull request #13013 from vitlibar/implement-custom-settings 
Implement custom settings
 2020-08-02 05:01:14 +03:00
Alexey Milovidov
1ae43b8beb Merge branch 'stack-frams-size-limit' of github.com:yandex/ClickHouse into stack-frams-size-limit 2020-08-02 04:36:12 +03:00
Alexey Milovidov
d3c0635fc0 Merge branch 'master' into stack-frams-size-limit 2020-08-02 04:35:09 +03:00
Alexey Milovidov
53450b1b09 Merge branch 'master' into merge-tree-settings-sanity-check 2020-08-02 02:47:57 +03:00
alexey-milovidov
e4f923097e
Update ClusterCopier.cpp 2020-08-02 01:43:43 +03:00
Alexey Milovidov
8fe201f1b9 Merge branch 'master' into merge-tree-settings-sanity-check 2020-08-01 19:20:11 +03:00
Alexey Milovidov
47e9ec3d58 Smaller stack frames 2020-08-01 17:55:20 +03:00
Alexey Milovidov
4fa0b16eaa Revert "Smaller stack frames" 
This reverts commit 73c349fd7f.
 2020-08-01 17:54:51 +03:00
Alexey Milovidov
73c349fd7f Smaller stack frames 2020-08-01 00:23:16 +03:00
Vitaly Baranov
7c4ae5ee65 Add the parameter custom_settings_prefixes to the server config. 2020-07-31 20:57:49 +03:00
Vitaly Baranov
56665a15f7 Rework and rename the template class SettingsCollection => BaseSettings. 2020-07-31 20:54:18 +03:00
Vitaly Baranov
18e3f1f60d Split SettingsCollection.h into 3 files: SettingsFields.h, SettingsEnums.h, SettingsCollection.h 2020-07-31 19:11:27 +03:00
Alexander Kuzmenkov
40504f6a6e Simpler version of #12999 w/o pos changes 2020-07-31 17:57:00 +03:00
Alexey Milovidov
c3ad710b84 Merge branch 'master' into crash-log 2020-07-31 16:12:53 +03:00
Alexey Milovidov
c202691319 Merge branch 'master' into stack-frams-size-limit 2020-07-30 23:53:52 +03:00
Alexey Milovidov
b9f49d31df Sanity checks for MergeTreeSettings 2020-07-30 22:08:13 +03:00
Vladimir Chebotarev
a9e0a5d95b Test fix. 2020-07-26 21:27:36 +03:00
Alexey Milovidov
1a83546baf Fix build 2020-07-22 08:59:38 +03:00
alesapin
daaa5cc382 Add setting allow_non_metadata_alters 2020-07-21 17:05:30 +03:00
Alexander Kuzmenkov
039cf36acb Minor fixes for query fuzzer 2020-07-16 21:05:34 +03:00
Denis Glazachev
59cb758cf7 Merge branch 'master' into ldap-per-user-authentication 2020-07-16 02:29:24 +04:00
Alexander Kuzmenkov
d6e7ab5988 Fuzzing-related fixes 2020-07-13 16:58:48 +03:00
Denis Glazachev
f787702922 Merge branch 'master' into ldap-per-user-authentication 
* master: (27 commits)
  Whitespaces
  Fix typo
  Fix UBSan report in base64
  Correct default secure port for clickhouse-benchmark #11044
  Remove test with bug #10697
  Update in-functions.md (#12430)
  Allow nullable key in MergeTree
  Update arithmetic-functions.md
  [docs] add rabbitmq docs (#12326)
  Lower block sizes and look what will happen #9248
  Fix lifetime_bytes/lifetime_rows for Buffer direct block write
  Retrigger CI
  Fix up  test_mysql_protocol failed
  Implement lifetime_rows/lifetime_bytes for Buffer engine
  Add comment regarding proxy tunnel usage in PocoHTTPClient.cpp
  Add lifetime_rows/lifetime_bytes interface (exported via system.tables)
  Tiny IStorage refactoring
  Trigger integration-test-runner image rebuild.
  Delete log.txt
  Fix test_mysql_client/test_python_client error
  ...
 2020-07-13 15:46:27 +04:00
Alexey Milovidov
e8a3f0abb3 Correct default secure port for clickhouse-benchmark #11044 2020-07-12 21:54:13 +03:00
Denis Glazachev
edb6ef8c09 Merge commit 'ceac649c01b0158090cd271776f3219f5e7ff57c' into ldap-per-user-authentication 
* commit 'ceac649c01b0158090cd271776f3219f5e7ff57c': (75 commits)
  [docs] split misc statements (#12403)
  Update 00405_pretty_formats.reference
  Update PrettyCompactBlockOutputFormat.cpp
  Update PrettyBlockOutputFormat.cpp
  Update DataTypeNullable.cpp
  Update 01383_remote_ambiguous_column_shard.sql
  add output_format_pretty_grid_charset setting in docs
  add setting output_format_pretty_grid_charset
  Added a test for #11135
  Update index.md
  RIGHT and FULL JOIN for MergeJoin (#12118)
  Update MergeTreeIndexFullText.cpp
  restart the tests
  [docs] add syntax highlight (#12398)
  query fuzzer
  Fix std::bad_typeid when JSON functions called with argument of wrong type.
  Allow typeid_cast() to cast nullptr to nullptr.
  fix another context-related segfault
  [security docs] actually, only admins can create advisories
  query fuzzer
  ...
 2020-07-11 21:32:36 +04:00
Alexander Kuzmenkov
eb6fbdfd4b query fuzzer 2020-07-10 17:16:16 +03:00
Denis Glazachev
8688a1f5d0 Recreate ExternalAuthenticators (LDAP) on config update 2020-07-10 15:59:48 +04:00
Denis Glazachev
5a4762bb8a
Merge branch 'master' into ldap-per-user-authentication 2020-07-09 14:50:02 +04:00
Alexey Milovidov
31cbdd1a56 system.crash_log: development 2020-07-09 07:15:45 +03:00
alesapin
1aa45f203b
bump CI 2020-07-08 13:40:02 +03:00
Alexander Kuzmenkov
a420b1989a Merge remote-tracking branch 'origin/master' into HEAD 2020-07-08 13:18:09 +03:00
Alexander Kuzmenkov
de0a6c0839 fix builds 2020-07-08 13:17:06 +03:00
alexey-milovidov
ffdd6e1af6
Merge pull request #12173 from nikitamikhaylov/summing-bug-fix 
Exclude partition key columns from SummingMergeTree
 2020-07-08 01:46:12 +03:00
Denis Glazachev
9effacfbc1 Merge branch 'master' into ldap-per-user-authentication 
* master: (1102 commits)
  Update README.md
  Update README.md
  Update README.md
  Update index.md
  [docs] add intrdocution for statements page (#12189)
  Revert "Run perf tests with memory sampling (for allocations >1M)"
  Sanitize LINK_LIBRARIES property for the directories (#12160)
  [docs] refactor Domains overview (#12186)
  DOCS-647: toStartOfSecond (#12190)
  [docs] add intrdocution for commercial page (#12187)
  DOCSUP-1348 Russian translation for new functions (#133) (#12194)
  changelog fixes
  Update index.md (#12191)
  Update zh kafka.md title (#12192)
  Added test for #3767
  style fix for #12152
  Tests for fixed issues #10846 and #7347
  changelog fixes
  [docs] introduction for special table engines (#12170)
  [docs] introduction for third-party interfaces (#12175)
  ...

# Conflicts:
#	src/Access/ya.make
#	src/Common/ErrorCodes.cpp
 2020-07-08 00:42:09 +04:00
Alexander Kuzmenkov
51c6683391 style 2020-07-07 20:10:55 +03:00
Alexander Kuzmenkov
d26441cdc4 cleanup 2020-07-07 19:33:19 +03:00
Alexander Kuzmenkov
1d1b49340c cleanup 2020-07-07 19:31:58 +03:00
Alexander Kuzmenkov
ac436c79eb Merge remote-tracking branch 'origin/master' into HEAD 2020-07-07 15:42:11 +03:00
Alexander Kuzmenkov
0c1985990b fixes 2020-07-07 15:35:53 +03:00
alesapin
be85f9f98a
Merge pull request #12165 from vitlibar/fix-split-dictionary-source-table-name 
Fix splitting table name of dictionary source
 2020-07-07 11:49:36 +03:00
Vitaly Baranov
4733504b51 Don't split dictionary source's table name into schema and table name itself 
if ODBC driver doesn't support schema.
 2020-07-06 23:41:39 +03:00
Nikita Mikhaylov
d31ed58f01 done 2020-07-06 17:33:31 +03:00
Nikita Mikhaylov
5c6d6bdf54
Merge pull request #11995 from azat/load_balancing-priority 
Load balancing manual priority
 2020-07-06 13:32:20 +04:00
myrrc
8c3417fbf7
ILIKE operator (#12125) 
* Integrated CachingAllocator into MarkCache

* fixed build errors

* reset func hotfix

* upd: Fixing build

* updated submodules links

* fix 2

* updating grabber allocator proto

* updating lost work

* updating CMake to use concepts

* some other changes to get it building (integration into MarkCache)

* further integration into caches

* updated Async metrics, fixed some build errors

* and some other errors revealing

* added perfect forwarding to some functions

* fix: forward template

* fix: constexpr modifier

* fix: FakePODAllocator missing member func

* updated PODArray constructor taking alloc params

* fix: PODArray overload with n restored

* fix: FakePODAlloc duplicating alloc() func

* added constexpr variable for alloc_tag_t

* split cache values by allocators, provided updates

* fix: memcpy

* fix: constexpr modifier

* fix: noexcept modifier

* fix: alloc_tag_t for PODArray constructor

* fix: PODArray copy ctor with different alloc

* fix: resize() signature

* updating to lastest working master

* syncing with 273267

* first draft version

* fix: update Searcher to case-insensitive

* added ILIKE test

* fixed style errors, updated test, split like and ilike,  added notILike

* replaced inconsistent comments

* fixed show tables ilike

* updated missing test cases

* regenerated ya.make

* Update 01355_ilike.sql

Co-authored-by: myrrc <me-clickhouse@myrrec.space>
Co-authored-by: alexey-milovidov <milovidov@yandex-team.ru>
 2020-07-05 18:57:59 +03:00
alexey-milovidov
f1151ed474
Merge pull request #12133 from ClickHouse/normalize-pid-file 
Normalize "pid" file handling #3501
 2020-07-04 21:36:27 +03:00
Alexey Milovidov
176a7f2f72 Normalize "pid" file handling #3501 2020-07-04 16:54:24 +03:00
Alexander Kuzmenkov
e7e4d29a54 more fuzzing 2020-07-03 15:52:16 +03:00
alesapin
c57edd2018 Tiny fixes 2020-07-03 11:02:35 +03:00
alesapin
64583ceb22 Merge branch 'master' into add-storage-rabbitmq-read-only 2020-07-02 16:08:29 +03:00
Alexander Kuzmenkov
3a50b81e31 Merge remote-tracking branch 'origin/master' into HEAD 2020-06-30 12:25:52 +03:00
Alexander Kuzmenkov
5c417f45b8 streaming wip 2020-06-30 12:25:23 +03:00
Azat Khuzhin
ebff4eae7d Add replica priority for load_balancing 
Make default 1, to match with <weight>
 2020-06-29 23:03:28 +03:00
Azat Khuzhin
e547f6b6d7 Add <weight> example in <remote_servers> into dist config 2020-06-29 23:03:28 +03:00
alexey-milovidov
eeb9998d51
Merge pull request #12022 from oandrew/clickhouse-local-improvements 
clickhouse-local improvements
 2020-06-29 17:54:24 +03:00
Andrew Onyshchuk
9d984c73a7 clickhouse-local: use std::filesystem::equivalent 2020-06-28 18:41:55 -05:00
Andrew Onyshchuk
c22350a937 clickhouse-local: logging flags fixes 2020-06-28 18:40:43 -05:00
alexey-milovidov
7376f18467
Merge pull request #11923 from ucasFL/client-not-argue 
client exit with unrecognized arguments
 2020-06-28 17:38:25 +03:00
Alexey Milovidov
44f2742a51 Fix bad log message at server startup 2020-06-27 15:56:06 +03:00
Alexander Kuzmenkov
58bf6f7adc
Merge pull request #11972 from ClickHouse/aku/cpu-freq 
Add CPU frequencies to system.asynchronous_metrics
 2020-06-26 20:45:58 +03:00
alexey-milovidov
e7e8ee79df
Merge pull request #11976 from ClickHouse/aku/client-cleanup 
Minor cleanup in Client.cpp before fuzzing
 2020-06-26 12:46:24 +03:00
feng lv
a159f1be54 Merge branch 'master' of github.com:ClickHouse/ClickHouse into client-not-argue 2020-06-26 17:34:24 +08:00
Alexander Kuzmenkov
c8832769f6 Fuzzer 2020-06-26 08:44:42 +03:00
feng lv
0518e6a4d1 add test 
update test

fix
 2020-06-26 12:50:46 +08:00
Alexander Kuzmenkov
4ebe1d3418 more cleanup 2020-06-26 07:37:18 +03:00
Alexander Kuzmenkov
a739a10556 Minor cleanup in Client.cpp before fuzzing 2020-06-26 04:34:06 +03:00
Alexander Kuzmenkov
d77f397b38 review fixes 2020-06-26 03:18:33 +03:00
alexey-milovidov
a34032cace
Merge pull request #11300 from blinkov/sentry 
Opt-in support for sending crash reports
 2020-06-25 17:20:50 +03:00
feng lv
6f3b78c774 client exit with unrecognized arguments 
format code

fix
 2020-06-25 18:09:35 +08:00
Alexander Kuzmenkov
5bf30b1c1f
Merge pull request #11931 from ClickHouse/aku/local-tmp 
Put clickhouse-local data to /tmp by default
 2020-06-25 10:06:38 +03:00
Alexander Kuzmenkov
593a0181bd
Merge pull request #11616 from ClickHouse/aku/perf-benchmark 
Add concurrent benchmark to performance test
 2020-06-25 09:36:52 +03:00
Alexander Kuzmenkov
579b13ab71 fixpu 2020-06-25 01:07:01 +03:00
Alexander Kuzmenkov
c678708c0c Put clickhouse-local data to /tmp by default 
This fixes https://github.com/ClickHouse/ClickHouse/issues/9848
Also fixes https://github.com/ClickHouse/ClickHouse/issues/11926
 2020-06-24 22:03:28 +03:00
alesapin
3fc65b3269 Merge branch 'master' into kssenii-rabbit-mq 2020-06-24 20:14:28 +03:00
Bharat Nallan
3d23c51d6a Merge https://github.com/ClickHouse/ClickHouse into ncb/remove-unused-headers 2020-06-24 09:16:46 -07:00
Alexander Kuzmenkov
2da7b356ab
Merge pull request #11668 from bharatnc/bnc/config-max-num-threads 
max_thread_pool_size setting for changing max Threads in Global Thread Pool
 2020-06-24 16:11:21 +03:00
bharatnc
4f10873c22 cleanup few unused headers 
The following files had some unused headers and caught my eyes, so
cleaning them up:

```bash
programs/obfuscator/Obfuscator.cpp
src/Databases/DatabaseAtomic.cpp
```
 2020-06-23 22:08:05 -07:00
Ivan Blinkov
45d1ca2567 merge master 2020-06-24 00:18:16 +03:00
Alexey Milovidov
cda2687195 Merge branch 'master' into fix-fpe-datetime64 2020-06-23 22:45:45 +03:00
Alexander Kuzmenkov
f0fbba5522 allow implicit initialization 2020-06-23 20:31:46 +03:00
Alexander Kuzmenkov
1a63972a4b Merge remote-tracking branch 'origin/master' into bnc/config-max-num-threads 2020-06-23 20:25:07 +03:00
Denis Glazachev
d17d72b075 More generic DN in the example 2020-06-23 18:23:34 +04:00
Alexander Kuzmenkov
e0bdbe73d2 Merge remote-tracking branch 'origin/master' into HEAD 2020-06-23 15:31:09 +03:00
Alexander Kuzmenkov
ab809f59b9 memory usage settings 2020-06-23 15:30:45 +03:00
alexey-milovidov
1c1e12f06b
Merge pull request #11826 from ClickHouse/send-logs-on-fatal-errors 
Send logs to client on fatal errors if possible
 2020-06-23 09:49:48 +03:00
Alexander Kuzmenkov
7372a18d45 fixup 2020-06-23 09:41:57 +03:00
Alexey Milovidov
b136999f75 Style 2020-06-22 23:32:12 +03:00
Alexey Milovidov
c66f020a63 Do not render progress too much 2020-06-22 22:16:48 +03:00
Alexander Kuzmenkov
96d2e9c997 Initialize GlobalThreadPool explicitly 2020-06-22 22:04:12 +03:00
alexey-milovidov
3e71b6ae07
Merge pull request #11845 from ClickHouse/loose-odbc-connection-string-validation 
Slightly relax the validation of ODBC connection string
 2020-06-22 21:19:30 +03:00
Alexander Kuzmenkov
bd5ab9c686 Merge remote-tracking branch 'origin/master' into bnc/config-max-num-threads 2020-06-22 15:55:39 +03:00
Ivan Blinkov
2c0ff29c48 Merge branch 'master' of github.com:ClickHouse/ClickHouse into sentry 2020-06-22 10:06:36 +03:00
Alexey Milovidov
55c219b107 Slightly loose the validation of ODBC connection string 2020-06-21 20:28:40 +03:00
Alexey Milovidov
9c97a1e6d1 Merge branch 'master' into mysql-vars 2020-06-21 19:12:24 +03:00
alexey-milovidov
4ee623ccac
Merge pull request #10242 from MovElb/movelb-postgresql-wire-protocol-impl 
PostgreSQL wire protocol implementation
 2020-06-21 14:39:22 +03:00
Alexey Milovidov
e6a969e2e6 Added support for MySQL style global variables syntax 2020-06-20 19:05:49 +03:00
Alexander Kuzmenkov
ed935cd66b fixup 2020-06-20 02:04:42 +03:00
Alexander Kuzmenkov
96368b7d0c fixup 2020-06-20 02:03:13 +03:00
Alexander Kuzmenkov
fbecf42dfc report the number of errors 2020-06-20 01:41:15 +03:00
Alexander Kuzmenkov
288f217df3 Merge remote-tracking branch 'origin/master' into HEAD 2020-06-19 23:07:53 +03:00
Alexander Kuzmenkov
cec65ce30d Merge remote-tracking branch 'origin/master' into HEAD 2020-06-19 22:34:50 +03:00
Denis Glazachev
5db60202b6 Merge branch 'master' into ldap-per-user-authentication 2020-06-19 00:11:08 +04:00