Sync with master #2
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
commit f1c193ea483872fee44e2969fc79a9b111a61d3d
Author: proller <proller@github.com>
Date: Sun May 6 16:28:46 2018 +0300
Clang5 build fix
commit c0ff4234747858dfd7741c90a5c77e9f8d47cd40
Merge: 852e11b 71814a3
Author: proller <proller@github.com>
Date: Sun May 6 16:04:26 2018 +0300
Merge remote-tracking branch 'upstream/master' into fix15
commit 852e11b
Author: proller <proller@github.com>
Date: Sat May 5 20:15:40 2018 +0300
Try master
commit 2a5cebb
Author: proller <proller@github.com>
Date: Sat May 5 19:34:55 2018 +0300
Try fix contrib/capnproto error with new compilers
commit bbfe581
Merge: f493474 634ba89
Author: proller <proller@github.com>
Date: Sat May 5 19:25:01 2018 +0300
Merge remote-tracking branch 'upstream/master' into fix15
commit f493474
Author: proller <proller@github.com>
Date: Sat May 5 15:31:47 2018 +0300
Build fixes
Build fixes
This patch is very crucial in case of many replicas.
Handles cases when url has fragment
…. [#CLICKHOUSE-3734]
Tests: use /usr/local if exists
…copy. [#CLICKHOUSE-3735]
Background schedule pool fixed
Fix prepared sets creation
chenxing-xc
pushed a commit
that referenced
this pull request
Aug 5, 2018
chenxing-xc
pushed a commit
that referenced
this pull request
Aug 5, 2018
…opypaste (ClickHouse#2616) * Clean up docs folder by moving all build-related tools to subdirectory * Remove unused script * Remove unused script #2 * Some refactoring in concatenate.py * Rewrite build.sh in Python - Get rid of half of copypaste in yml files - Draft of redirects support * Actually include redirects.conf * copy conf too * Keep H1 the same in single page docs * fix some paths * Keep only pages index in yaml * Workaround for missing jQuery * Delay docs init
chenxing-xc
pushed a commit
that referenced
this pull request
Aug 5, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.