Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Use "[Content:cluster=...]" for routes instead of (only-sometimes-)generated ↵ | Jon Marius Venstad | 2021-01-05 | 7 | -10/+10 |
| | | | | -direct route | ||||
* | Revert "Revert "Jonmv/remove storage policy"" | Jon Marius Venstad | 2021-01-05 | 35 | -1242/+1060 |
| | | | | This reverts commit 75b2e4c11ea6463c335f1c77dab3fdb5493e5600. | ||||
* | Merge pull request #15910 from vespa-engine/balder/improve-language | Kristian Aune | 2021-01-05 | 1 | -2/+2 |
|\ | | | | | Make the language actually readable. | ||||
| * | Simplify | Henning Baldersheim | 2021-01-05 | 1 | -1/+1 |
| | | |||||
| * | Make the language actually readable. | Henning Baldersheim | 2021-01-05 | 1 | -2/+2 |
|/ | |||||
* | Merge pull request #15909 from ↵ | Henning Baldersheim | 2021-01-05 | 4 | -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 documents | Tor Brede Vekterli | 2021-01-05 | 4 | -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 Ressem | 2021-01-05 | 1 | -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 Musum | 2021-01-05 | 1 | -7/+2 |
|/ / | |||||
* | | Merge pull request #15907 from ↵ | Jon Marius Venstad | 2021-01-05 | 35 | -1060/+1242 |
|\ \ | | | | | | | | | | | | | vespa-engine/revert-15873-jonmv/remove-storage-policy Revert "Jonmv/remove storage policy" | ||||
| * | | Revert "Jonmv/remove storage policy" | Jon Marius Venstad | 2021-01-05 | 35 | -1060/+1242 |
|/ / | |||||
* | | Merge pull request #15904 from ↵ | Harald Musum | 2021-01-05 | 16 | -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 Musum | 2021-01-05 | 16 | -271/+71 |
| | | | |||||
* | | | Merge pull request #15905 from vespa-engine/hmusum/dont-swallow-exception | Harald Musum | 2021-01-05 | 1 | -8/+2 |
|\ \ \ | | | | | | | | | Don't swallow exception | ||||
| * | | | Don't swallow exception | Harald Musum | 2021-01-05 | 1 | -8/+2 |
| | | | | |||||
* | | | | Merge pull request #15873 from vespa-engine/jonmv/remove-storage-policy | Jon Marius Venstad | 2021-01-05 | 35 | -1242/+1060 |
|\ \ \ \ | | | | | | | | | | | Jonmv/remove storage policy | ||||
| * \ \ \ | Merge branch 'jonmv/remove-storage-policy' of github.com:vespa-engine/vespa ↵ | Jon Marius Venstad | 2021-01-04 | 1 | -1/+1 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | into jonmv/remove-storage-policy | ||||
| | * | | | | Specify when TODO | Jon Marius Venstad | 2021-01-04 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Use clustername-direct routes for visitors | Jon Marius Venstad | 2021-01-04 | 9 | -17/+14 |
| |/ / / / | |||||
| * | | | | More non-functional | Jon Marius Venstad | 2020-12-30 | 2 | -39/+21 |
| | | | | | |||||
| * | | | | Non-functional | Jon Marius Venstad | 2020-12-30 | 2 | -5/+5 |
| | | | | | |||||
| * | | | | Merge storagepolicy into contentpolicy | Jon Marius Venstad | 2020-12-30 | 9 | -373/+321 |
| | | | | | |||||
| * | | | | Use just content cluster name as route | Jon Marius Venstad | 2020-12-30 | 8 | -16/+12 |
| | | | | | |||||
| * | | | | Replace use of [Storage... with [Content... and avoid overriding config id | Jon Marius Venstad | 2020-12-30 | 15 | -67/+43 |
| | | | | | |||||
| * | | | | Revert "Revert "Merge StoragePolicy down into ContentPolicy, and always use ↵ | Arnstein Ressem | 2020-12-30 | 9 | -750/+669 |
| | | | | | | | | | | | | | | | | | | | | this"" | ||||
* | | | | | Merge pull request #15903 from vespa-engine/hmusum/copy-to-temp-dir-and-move | Harald Musum | 2021-01-05 | 1 | -2/+7 |
|\ \ \ \ \ | |_|/ / / |/| | | | | Copy to temp dir and move | ||||
| * | | | | Copy to temp dir and move directory | Harald Musum | 2021-01-05 | 1 | -2/+7 |
| | | | | | |||||
* | | | | | Merge pull request #15897 from ↵ | Øyvind Grønnesby | 2021-01-05 | 2 | -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ønnesby | 2021-01-04 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Add system name to quota error message | Øyvind Grønnesby | 2021-01-04 | 2 | -8/+27 |
| | | | | | |||||
* | | | | | Merge pull request #15400 from ↵ | Harald Musum | 2021-01-05 | 16 | -71/+271 |
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | vespa-engine/revert-14062-revert-14057-hmusum/upgrade-to-curator-4 Reapply "Upgrade to Curator 4" | ||||
| * | | | | Fix arguments used when constructing MockCuratorFramework | Harald Musum | 2021-01-02 | 1 | -5/+3 |
| | | | | | |||||
| * | | | | Fix newWatcherRemoveCuratorFramework() | Harald Musum | 2021-01-01 | 1 | -2/+15 |
| | | | | | |||||
| * | | | | Merge branch 'master' into revert-14062-revert-14057-hmusum/upgrade-to-curator-4 | Harald Musum | 2021-01-01 | 1528 | -31514/+20073 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'master' into revert-14062-revert-14057-hmusum/upgrade-to-curator-4 | Harald Musum | 2020-11-26 | 438 | -6092/+6567 |
| |\ \ \ \ \ | |||||
| * | | | | | | Revert "Revert "Upgrade to Curator 4"" | Harald Musum | 2020-11-20 | 16 | -58/+463 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #15902 from ↵ | Henning Baldersheim | 2021-01-04 | 1 | -1/+0 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | vespa-engine/toregge/remove-unused-proton-member-variable Remove unused member variable. | ||||
| * | | | | | | | Remove unused member variable. | Tor Egge | 2021-01-04 | 1 | -1/+0 |
| | | | | | | | | |||||
* | | | | | | | | Merge pull request #15901 from ↵ | Henning Baldersheim | 2021-01-04 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | vespa-engine/toregge/delete-implicitly-deleted-move-assignment-operator Delete implicitly deleted move-assignment operator. | ||||
| * | | | | | | | | Delete implicitly deleted move-assignment operator. | Tor Egge | 2021-01-04 | 1 | -1/+1 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge pull request #15900 from ↵ | Henning Baldersheim | 2021-01-04 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | vespa-engine/toregge/add-missing-algorithm-include Include algorithm header file when needed. | ||||
| * | | | | | | | Include algorithm header file when needed. | Tor Egge | 2021-01-04 | 1 | -0/+1 |
|/ / / / / / / | |||||
* | | | | | | | Merge pull request #15899 from vespa-engine/bjorncs/stabilize-test | Jon Marius Venstad | 2021-01-04 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Stabilize unit test | ||||
| * | | | | | | | Stabilize unit test | Bjørn Christian Seime | 2021-01-04 | 1 | -1/+1 |
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | 200 with no content is valid behaviour | ||||
* | | | | | | | Merge pull request #15898 from vespa-engine/olaa/always-update-is-master-metric | Ola Aunrønning | 2021-01-04 | 2 | -10/+3 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | Always set 'is-master' metric. Remove 'master-change' | ||||
| * | | | | | | Change isMaster to updateMasterState | Ola Aunrønning | 2021-01-04 | 2 | -2/+2 |
| | | | | | | | |||||
| * | | | | | | Always set 'is-master' metric. Remove 'master-change' | Ola Aunrønning | 2021-01-04 | 2 | -10/+3 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #15896 from ↵ | Henning Baldersheim | 2021-01-04 | 1 | -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 Egge | 2021-01-04 | 1 | -1/+1 |
| | | | | | | | | |||||
* | | | | | | | | Merge pull request #15893 from ↵ | Harald Musum | 2021-01-04 | 3 | -18/+23 |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | vespa-engine/hmusum/setup-correct-zookeeper-components-for-clustercontroller Make sure to setup all needed components for reconfigurable zookeeper… |