thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-22 15:42:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix conflict resolution mistake

Browse Source
This commit is contained in:
Ilya Golshtein 2020-09-09 23:23:48 +03:00
parent 66a055ddde
commit 23853cc8cf
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/integration/helpers/cluster.py
View File

@ -1225,10 +1225,6 @@ class ClickHouseInstance:
if self.with_kerberized_kafka:
distutils.dir_util.copy_tree(self.kerberos_secrets_dir, p.abspath(p.join(self.path, 'secrets')))
# Copy config dir
if self.custom_config_dir:
distutils.dir_util.copy_tree(self.custom_config_dir, configs_dir)
# Copy config.d configs
print "Copy custom test config files {} to {}".format(self.custom_main_config_paths, self.config_d_dir)
for path in self.custom_main_config_paths: