aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Use "[Content:cluster=...]" for routes instead of (only-sometimes-)generated ↵Jon Marius Venstad2021-01-057-10/+10
| | | | -direct route
* Revert "Revert "Jonmv/remove storage policy""Jon Marius Venstad2021-01-0535-1242/+1060
| | | | This reverts commit 75b2e4c11ea6463c335f1c77dab3fdb5493e5600.
* Merge pull request #15910 from vespa-engine/balder/improve-languageKristian Aune2021-01-051-2/+2
|\ | | | | Make the language actually readable.
| * SimplifyHenning Baldersheim2021-01-051-1/+1
| |
| * Make the language actually readable.Henning Baldersheim2021-01-051-2/+2
|/
* Merge pull request #15909 from ↵Henning Baldersheim2021-01-054-15/+16
|\ | | | | | | | | vespa-engine/vekterli/only-fetch-doc-id-when-splitting Only fetch document IDs in bucket when splitting, not whole documents
| * Only fetch document IDs in bucket when splitting, not whole documentsTor Brede Vekterli2021-01-054-15/+16
| | | | | | | | | | | | | | Splitting code only needs to look at the document IDs to figure out the distribution of the target buckets. Remove tracking of document sizes (which did need the whole documents) since it was only used in a warning log message.
* | Merge pull request #15908 from ↵Arnstein Ressem2021-01-051-7/+2
|\ \ | | | | | | | | | | | | vespa-engine/revert-15903-hmusum/copy-to-temp-dir-and-move Revert "Copy to temp dir and move"
| * | Revert "Copy to temp dir and move"Harald Musum2021-01-051-7/+2
|/ /
* | Merge pull request #15907 from ↵Jon Marius Venstad2021-01-0535-1060/+1242
|\ \ | | | | | | | | | | | | vespa-engine/revert-15873-jonmv/remove-storage-policy Revert "Jonmv/remove storage policy"
| * | Revert "Jonmv/remove storage policy"Jon Marius Venstad2021-01-0535-1060/+1242
|/ /
* | Merge pull request #15904 from ↵Harald Musum2021-01-0516-271/+71
|\ \ | | | | | | | | | | | | vespa-engine/revert-15400-revert-14062-revert-14057-hmusum/upgrade-to-curator-4 Revert "Reapply "Upgrade to Curator 4""
| * | Revert "Reapply "Upgrade to Curator 4""Harald Musum2021-01-0516-271/+71
| | |
* | | Merge pull request #15905 from vespa-engine/hmusum/dont-swallow-exceptionHarald Musum2021-01-051-8/+2
|\ \ \ | | | | | | | | Don't swallow exception
| * | | Don't swallow exceptionHarald Musum2021-01-051-8/+2
| | | |
* | | | Merge pull request #15873 from vespa-engine/jonmv/remove-storage-policyJon Marius Venstad2021-01-0535-1242/+1060
|\ \ \ \ | | | | | | | | | | Jonmv/remove storage policy
| * \ \ \ Merge branch 'jonmv/remove-storage-policy' of github.com:vespa-engine/vespa ↵Jon Marius Venstad2021-01-041-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | into jonmv/remove-storage-policy
| | * | | | Specify when TODOJon Marius Venstad2021-01-041-1/+1
| | | | | |
| * | | | | Use clustername-direct routes for visitorsJon Marius Venstad2021-01-049-17/+14
| |/ / / /
| * | | | More non-functionalJon Marius Venstad2020-12-302-39/+21
| | | | |
| * | | | Non-functionalJon Marius Venstad2020-12-302-5/+5
| | | | |
| * | | | Merge storagepolicy into contentpolicyJon Marius Venstad2020-12-309-373/+321
| | | | |
| * | | | Use just content cluster name as routeJon Marius Venstad2020-12-308-16/+12
| | | | |
| * | | | Replace use of [Storage... with [Content... and avoid overriding config idJon Marius Venstad2020-12-3015-67/+43
| | | | |
| * | | | Revert "Revert "Merge StoragePolicy down into ContentPolicy, and always use ↵Arnstein Ressem2020-12-309-750/+669
| | | | | | | | | | | | | | | | | | | | this""
* | | | | Merge pull request #15903 from vespa-engine/hmusum/copy-to-temp-dir-and-moveHarald Musum2021-01-051-2/+7
|\ \ \ \ \ | |_|/ / / |/| | | | Copy to temp dir and move
| * | | | Copy to temp dir and move directoryHarald Musum2021-01-051-2/+7
| | | | |
* | | | | Merge pull request #15897 from ↵Øyvind Grønnesby2021-01-052-9/+28
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | vespa-engine/ogronnesby/system-name-in-quota-message Add system name to quota error message
| * | | | Test presence of system name in error messageØyvind Grønnesby2021-01-041-2/+2
| | | | |
| * | | | Add system name to quota error messageØyvind Grønnesby2021-01-042-8/+27
| | | | |
* | | | | Merge pull request #15400 from ↵Harald Musum2021-01-0516-71/+271
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | vespa-engine/revert-14062-revert-14057-hmusum/upgrade-to-curator-4 Reapply "Upgrade to Curator 4"
| * | | | Fix arguments used when constructing MockCuratorFrameworkHarald Musum2021-01-021-5/+3
| | | | |
| * | | | Fix newWatcherRemoveCuratorFramework()Harald Musum2021-01-011-2/+15
| | | | |
| * | | | Merge branch 'master' into revert-14062-revert-14057-hmusum/upgrade-to-curator-4Harald Musum2021-01-011528-31514/+20073
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into revert-14062-revert-14057-hmusum/upgrade-to-curator-4Harald Musum2020-11-26438-6092/+6567
| |\ \ \ \ \
| * | | | | | Revert "Revert "Upgrade to Curator 4""Harald Musum2020-11-2016-58/+463
| | | | | | |
* | | | | | | Merge pull request #15902 from ↵Henning Baldersheim2021-01-041-1/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | vespa-engine/toregge/remove-unused-proton-member-variable Remove unused member variable.
| * | | | | | | Remove unused member variable.Tor Egge2021-01-041-1/+0
| | | | | | | |
* | | | | | | | Merge pull request #15901 from ↵Henning Baldersheim2021-01-041-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | vespa-engine/toregge/delete-implicitly-deleted-move-assignment-operator Delete implicitly deleted move-assignment operator.
| * | | | | | | | Delete implicitly deleted move-assignment operator.Tor Egge2021-01-041-1/+1
| |/ / / / / / /
* | | | | | | | Merge pull request #15900 from ↵Henning Baldersheim2021-01-041-0/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | vespa-engine/toregge/add-missing-algorithm-include Include algorithm header file when needed.
| * | | | | | | Include algorithm header file when needed.Tor Egge2021-01-041-0/+1
|/ / / / / / /
* | | | | | | Merge pull request #15899 from vespa-engine/bjorncs/stabilize-testJon Marius Venstad2021-01-041-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Stabilize unit test
| * | | | | | | Stabilize unit testBjørn Christian Seime2021-01-041-1/+1
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | 200 with no content is valid behaviour
* | | | | | | Merge pull request #15898 from vespa-engine/olaa/always-update-is-master-metricOla Aunrønning2021-01-042-10/+3
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | Always set 'is-master' metric. Remove 'master-change'
| * | | | | | Change isMaster to updateMasterStateOla Aunrønning2021-01-042-2/+2
| | | | | | |
| * | | | | | Always set 'is-master' metric. Remove 'master-change'Ola Aunrønning2021-01-042-10/+3
| | | | | | |
* | | | | | | Merge pull request #15896 from ↵Henning Baldersheim2021-01-041-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | vespa-engine/toregge/stop-forcing-inlining-for-result-member-function Stop forcing inlining of result member function.
| * | | | | | | Stop forcing inlining of result member function.Tor Egge2021-01-041-1/+1
| | | | | | | |
* | | | | | | | Merge pull request #15893 from ↵Harald Musum2021-01-043-18/+23
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | vespa-engine/hmusum/setup-correct-zookeeper-components-for-clustercontroller Make sure to setup all needed components for reconfigurable zookeeper…