summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Revert "Jonmv/remove storage policy"Jon Marius Venstad2021-01-0535-1060/+1242
* Merge pull request #15904 from vespa-engine/revert-15400-revert-14062-revert-...Harald Musum2021-01-0516-271/+71
|\
| * 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 exceptionHarald Musum2021-01-051-8/+2
* | | Merge pull request #15873 from vespa-engine/jonmv/remove-storage-policyJon Marius Venstad2021-01-0535-1242/+1060
|\ \ \
| * \ \ Merge branch 'jonmv/remove-storage-policy' of github.com:vespa-engine/vespa i...Jon Marius Venstad2021-01-041-1/+1
| |\ \ \
| | * | | 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 t...Arnstein Ressem2020-12-309-750/+669
* | | | 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 directoryHarald Musum2021-01-051-2/+7
* | | | Merge pull request #15897 from vespa-engine/ogronnesby/system-name-in-quota-m...Øyvind Grønnesby2021-01-052-9/+28
|\ \ \ \ | |_|_|/ |/| | |
| * | | 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 vespa-engine/revert-14062-revert-14057-hmusum/...Harald Musum2021-01-0516-71/+271
|\ \ \ \ | |_|/ / |/| | |
| * | | 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 vespa-engine/toregge/remove-unused-proton-memb...Henning Baldersheim2021-01-041-1/+0
|\ \ \ \ \ \
| * | | | | | Remove unused member variable.Tor Egge2021-01-041-1/+0
* | | | | | | Merge pull request #15901 from vespa-engine/toregge/delete-implicitly-deleted...Henning Baldersheim2021-01-041-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Delete implicitly deleted move-assignment operator.Tor Egge2021-01-041-1/+1
| |/ / / / / /
* | | | | | | Merge pull request #15900 from vespa-engine/toregge/add-missing-algorithm-inc...Henning Baldersheim2021-01-041-0/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | 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 testBjørn Christian Seime2021-01-041-1/+1
* | | | | | | Merge pull request #15898 from vespa-engine/olaa/always-update-is-master-metricOla Aunrønning2021-01-042-10/+3
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | 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 vespa-engine/toregge/stop-forcing-inlining-for...Henning Baldersheim2021-01-041-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Stop forcing inlining of result member function.Tor Egge2021-01-041-1/+1
* | | | | | | | Merge pull request #15893 from vespa-engine/hmusum/setup-correct-zookeeper-co...Harald Musum2021-01-043-18/+23
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Make sure to setup all needed components for reconfigurable zookeeper server ...Harald Musum2021-01-043-18/+23
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge pull request #15874 from vespa-engine/arnej/no-tensors-in-match-featureArne H Juul2021-01-041-0/+4
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | tensor-type fields are not matchable, skip in setupArne Juul2020-12-281-0/+4
| | |_|_|_|/ | |/| | | |
* | | | | | Merge pull request #15895 from vespa-engine/toregge/add-missing-cstddef-includeHenning Baldersheim2021-01-042-0/+2
|\ \ \ \ \ \
| * | | | | | Include cstddef header file when needed.Tor Egge2021-01-042-0/+2
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #15894 from vespa-engine/toregge/use-stricter-version-of-d...Henning Baldersheim2021-01-042-2/+2
|\ \ \ \ \ \
| * | | | | | Use stricter version of dynamic_cast.Tor Egge2021-01-042-2/+2
| |/ / / / /
* | | | | | Merge pull request #15892 from vespa-engine/toregge/add-braces-for-conditiona...Henning Baldersheim2021-01-041-2/+3
|\ \ \ \ \ \
| * | | | | | Add braces for conditional statements.Tor Egge2021-01-041-2/+3
| |/ / / / /
* | | | | | Merge pull request #15891 from vespa-engine/toregge/add-missing-condition-var...Henning Baldersheim2021-01-041-0/+1
|\ \ \ \ \ \