Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | Merge pull request #3820 from vespa-engine/aressem/move-config-server-defs | Harald Musum | 2017-10-19 | 2 | -2/+3 | |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | ||||||
| * | | | | | Move config server defs and make sure VESPA_USER owns var/. | Arnstein Ressem | 2017-10-19 | 2 | -2/+3 | |
| | |_|/ / | |/| | | | ||||||
* | | | | | Merge pull request #3819 from vespa-engine/freva/use-unique-provision-id-lock | Valerij Fredriksen | 2017-10-19 | 1 | -1/+2 | |
|\ \ \ \ \ | ||||||
| * | | | | | Fix provision id lock | Valerij Fredriksen | 2017-10-19 | 1 | -1/+2 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #3818 from vespa-engine/revert-3615-hakon/provide-service-... | Håkon Hallingstad | 2017-10-19 | 4 | -21/+3 | |
|\ \ \ \ \ | ||||||
| * | | | | | Revert "Provide service-monitor and application-model" | Håkon Hallingstad | 2017-10-19 | 4 | -21/+3 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #3816 from vespa-engine/bjorncs/travis | Arnstein Ressem | 2017-10-19 | 7 | -58/+9 | |
|\ \ \ \ \ | ||||||
| * | | | | | Do full build for both master branch and PRs | Bjørn Christian Seime | 2017-10-19 | 7 | -56/+9 | |
| * | | | | | Ensure all jobs share same cache | Bjørn Christian Seime | 2017-10-19 | 1 | -5/+3 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #3615 from vespa-engine/hakon/provide-service-monitor-and-... | Håkon Hallingstad | 2017-10-19 | 4 | -3/+21 | |
|\ \ \ \ \ | |/ / / / |/| | | | | ||||||
| * | | | | Provide service-monitor and application-model | Håkon Hallingstad | 2017-10-02 | 4 | -3/+21 | |
* | | | | | Merge pull request #3814 from vespa-engine/hmusum/use-share-dir-for-configdef... | Arnstein Ressem | 2017-10-19 | 9 | -33/+35 | |
|\ \ \ \ \ | ||||||
| * | | | | | Use config definitions from a configured directory | Harald Musum | 2017-10-18 | 9 | -33/+35 | |
* | | | | | | Merge pull request #3815 from vespa-engine/geirst/do-not-require-fields-in-fi... | Henning Baldersheim | 2017-10-18 | 2 | -22/+19 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Do not require that fields in a field set must be part of the document type. | Geir Storli | 2017-10-18 | 2 | -22/+19 | |
| |/ / / / / | ||||||
* | | | | | | Merge pull request #3796 from vespa-engine/jvenstad/catch-metrics-fetching-er... | Jon Marius Venstad | 2017-10-18 | 1 | -10/+13 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | ||||||
| * | | | | | As requested. | Jon Marius Venstad | 2017-10-18 | 1 | -2/+2 | |
| * | | | | | Cleaner code | Jon Marius Venstad | 2017-10-17 | 1 | -10/+13 | |
* | | | | | | Merge pull request #3788 from vespa-engine/bratseth/dont-remove-recall-neutra... | Jon Bratseth | 2017-10-18 | 10 | -99/+131 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Remove unranked items not contributing to recall | Jon Bratseth | 2017-10-18 | 2 | -3/+26 | |
| * | | | | | | Nonfunctional changes only | Jon Bratseth | 2017-10-18 | 3 | -3/+16 | |
| * | | | | | | Merge with master | Jon Bratseth | 2017-10-17 | 73 | -1895/+385 | |
| |\ \ \ \ \ \ | ||||||
| * | | | | | | | Don't remove OR terms which contributes to rank | Jon Bratseth | 2017-10-17 | 4 | -56/+51 | |
| * | | | | | | | Change method order - no functiona changes | Jon Bratseth | 2017-10-17 | 1 | -49/+50 | |
| * | | | | | | | Remove temporary line | Jon Bratseth | 2017-10-17 | 1 | -1/+0 | |
| * | | | | | | | Nonfunctional changes only | Jon Bratseth | 2017-10-17 | 4 | -4/+8 | |
* | | | | | | | | Merge pull request #3809 from vespa-engine/kkraune/ipv4-retire-ap-northeast-2 | Valerij Fredriksen | 2017-10-18 | 1 | -0/+2 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | retire ap-northeast-2 ipv4 | Kristian Aune | 2017-10-18 | 1 | -0/+2 | |
| | |_|_|_|/ / / | |/| | | | | | | ||||||
* | | | | | | | | Merge pull request #3805 from vespa-engine/smorgrav/cost_npe | Torbjørn Smørgrav | 2017-10-18 | 2 | -2/+12 | |
|\ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ | Merge branch 'master' into smorgrav/cost_npe | toby | 2017-10-18 | 56 | -1309/+278 | |
| |\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Avoid NPE when cluster utilizations are updated but not cluster info | toby | 2017-10-18 | 2 | -2/+12 | |
* | | | | | | | | | | Merge pull request #3813 from vespa-engine/bjorncs/travis | Bjørn Christian Seime | 2017-10-18 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | Configure ccache through cli interface | Bjørn Christian Seime | 2017-10-18 | 1 | -2/+2 | |
| | |_|_|_|_|_|/ / | |/| | | | | | | | ||||||
* | | | | | | | | | Merge pull request #3812 from vespa-engine/bratseth/catch-missing-zone | Torbjørn Smørgrav | 2017-10-18 | 1 | -5/+9 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | Catch more errors and warn | Jon Bratseth | 2017-10-18 | 1 | -5/+9 | |
* | | | | | | | | | Merge pull request #3811 from vespa-engine/gjoranv/package-or-namespace | Bjørn Christian Seime | 2017-10-18 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Update error message for bundled defs without package or namespace | gjoranv | 2017-10-18 | 1 | -1/+1 | |
| |/ / / / / / / / | ||||||
* | | | | | | | | | Merge pull request #3810 from vespa-engine/bjorncs/warn-on-deprecated-principal | Bjørn Christian Seime | 2017-10-18 | 2 | -1/+3 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | Warn when using deprecated authorization validation | Bjørn Christian Seime | 2017-10-18 | 2 | -1/+3 | |
* | | | | | | | | | Merge pull request #3806 from vespa-engine/hmusum/do-not-log-when-application... | Harald Musum | 2017-10-18 | 1 | -3/+6 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | Do not log when application got redeployed | Harald Musum | 2017-10-18 | 1 | -3/+6 | |
| | |/ / / / / / | |/| | | | | | | ||||||
* | | | | | | | | Merge pull request #3802 from vespa-engine/balder/wire-in-a-destructor-callba... | Henning Baldersheim | 2017-10-18 | 20 | -114/+149 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Here we can not move the token. We need it ourselves. | Henning Baldersheim | 2017-10-18 | 1 | -4/+4 | |
| * | | | | | | | | Use make_shared/make_unique | Henning Baldersheim | 2017-10-18 | 1 | -16/+18 | |
| * | | | | | | | | Use the existing sync method. | Henning Baldersheim | 2017-10-18 | 1 | -3/+1 | |
| * | | | | | | | | Introduce async write interface in the TLS. | Henning Baldersheim | 2017-10-18 | 20 | -99/+134 | |
| | |_|_|_|_|_|/ | |/| | | | | | | ||||||
* | | | | | | | | Merge pull request #3803 from vespa-engine/bjorncs/athenz | gjoranv | 2017-10-18 | 7 | -33/+33 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Rename Athens->Athenz | Bjørn Christian Seime | 2017-10-18 | 7 | -33/+33 | |
| | |_|/ / / / / | |/| | | | | | | ||||||
* | | | | | | | | Merge pull request #3782 from vespa-engine/balder/remove-searchxxxpolicy | Henning Baldersheim | 2017-10-18 | 24 | -1113/+73 | |
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | ||||||
| * | | | | | | | Merge branch 'master' into balder/remove-searchxxxpolicy | Henning Baldersheim | 2017-10-17 | 6 | -12/+8 | |
| |\ \ \ \ \ \ \ |