Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Remove zombie code | Jon Bratseth | 2018-11-29 | 20 | -470/+74 |
* | Merge pull request #7817 from vespa-engine/toregge/allow-zero-arg-parenthesis... | Jon Bratseth | 2018-11-29 | 1 | -1/+1 |
|\ | |||||
| * | Don't allow function argument list to start with comma. | Tor Egge | 2018-11-29 | 1 | -1/+1 |
* | | Merge pull request #7816 from vespa-engine/revert-7810-revert-7808-bratseth/a... | Lester Solbakken | 2018-11-29 | 9 | -54/+36 |
|\ \ | |||||
| * | | Revert "Revert "Always output tensor type in toString"" | Jon Bratseth | 2018-11-29 | 9 | -54/+36 |
|/ / | |||||
* | | Merge pull request #7811 from vespa-engine/toregge/fail-duplicate-import | Geir Storli | 2018-11-29 | 3 | -1/+21 |
|\ \ | |||||
| * | | Fail duplicate import of field. | Tor Egge | 2018-11-29 | 3 | -1/+21 |
| |/ | |||||
* | | Merge pull request #7813 from vespa-engine/balder/investigate-adaptive-distri... | Henning Baldersheim | 2018-11-29 | 4 | -13/+23 |
|\ \ | |||||
| * | | Prevent bad effects of zero search time. | Henning Baldersheim | 2018-11-29 | 4 | -13/+23 |
* | | | Merge pull request #7814 from vespa-engine/balder/use-std-steady-clock | Henning Baldersheim | 2018-11-29 | 5 | -27/+12 |
|\ \ \ | |||||
| * | | | Include what you need and no more. | Henning Baldersheim | 2018-11-29 | 5 | -3/+6 |
| * | | | Use std::chrono::steady::clock | Henning Baldersheim | 2018-11-29 | 2 | -24/+6 |
| |/ / | |||||
* | | | Merge pull request #7807 from vespa-engine/bratseth/remove-nonimplemented-inf... | gjoranv | 2018-11-29 | 3 | -19/+5 |
|\ \ \ | |||||
| * | | | Remove unimplemented metrics | Jon Bratseth | 2018-11-28 | 3 | -19/+5 |
* | | | | Merge pull request #7801 from vespa-engine/bjorncs/tls-certificate-reloading | Bjørn Christian Seime | 2018-11-29 | 7 | -30/+145 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | Add TODO | Bjørn Christian Seime | 2018-11-28 | 1 | -0/+1 |
| * | | | Use TlsContext to construct TlsCryptoEngine | Bjørn Christian Seime | 2018-11-28 | 5 | -30/+39 |
| * | | | Add TlsContext interface with a implementation based on tls options | Bjørn Christian Seime | 2018-11-28 | 2 | -0/+105 |
* | | | | Merge pull request #7786 from vespa-engine/havardpe/initial-portal-code | Tor Brede Vekterli | 2018-11-29 | 24 | -0/+2070 |
|\ \ \ \ | |||||
| * | | | | initial portal code | Håvard Pettersen | 2018-11-27 | 24 | -0/+2070 |
* | | | | | Merge pull request #7804 from vespa-engine/balder/randomize-keys | Henning Baldersheim | 2018-11-29 | 4 | -10/+49 |
|\ \ \ \ \ | |||||
| * | | | | | Follow template instantiation. | Henning Baldersheim | 2018-11-28 | 1 | -1/+3 |
| * | | | | | Use a simple and instead of div for modulo operation. | Henning Baldersheim | 2018-11-28 | 1 | -1/+2 |
| * | | | | | Reserve a large hashmap to reduce number of collisions. | Henning Baldersheim | 2018-11-28 | 1 | -1/+1 |
| * | | | | | Also test with hash_map | Henning Baldersheim | 2018-11-28 | 1 | -2/+34 |
| * | | | | | Randomize keys | Henning Baldersheim | 2018-11-28 | 1 | -5/+9 |
* | | | | | | Merge pull request #7809 from vespa-engine/jvenstad/run-tester-on-same-versio... | Jon Bratseth | 2018-11-29 | 1 | -6/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Get version information from a better source >_< | Jon Marius Venstad | 2018-11-29 | 1 | -6/+1 |
* | | | | | | | Merge pull request #7812 from vespa-engine/freva/re-remove-containerenvironme... | Valerij Fredriksen | 2018-11-29 | 5 | -68/+3 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Revert "Revert "Do not set VESPA_CONFIGSERVERS in DockerOperations"" | Valerij Fredriksen | 2018-11-29 | 3 | -11/+3 |
| * | | | | | | | Revert "Revert "Remove ContainerEnvironmentResolver"" | Valerij Fredriksen | 2018-11-29 | 4 | -53/+2 |
| * | | | | | | | Revert "Revert "Remove unused method and variable from ConfigServerInfo"" | Valerij Fredriksen | 2018-11-29 | 1 | -6/+0 |
* | | | | | | | | Merge pull request #7810 from vespa-engine/revert-7808-bratseth/always-output... | Håkon Hallingstad | 2018-11-29 | 9 | -36/+54 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | |||||
| * | | | | | | | Revert "Always output tensor type in toString" | Håkon Hallingstad | 2018-11-29 | 9 | -36/+54 |
|/ / / / / / / | |||||
* | | | | | | | Merge pull request #7800 from vespa-engine/hmusum/remove-unused-method | Håkon Hallingstad | 2018-11-29 | 1 | -4/+0 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Remove unused method | Harald Musum | 2018-11-28 | 1 | -4/+0 |
* | | | | | | | | Merge pull request #7808 from vespa-engine/bratseth/always-output-tensor-type... | Lester Solbakken | 2018-11-29 | 9 | -54/+36 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Expect tensor type | Jon Bratseth | 2018-11-28 | 1 | -1/+1 |
| * | | | | | | | | Always output tensor type in toString | Jon Bratseth | 2018-11-28 | 8 | -53/+35 |
| | |_|_|_|_|_|/ | |/| | | | | | | |||||
* | | | | | | | | Merge pull request #7805 from vespa-engine/bratseth/allow-zero-arg-parenthesis | Lester Solbakken | 2018-11-29 | 3 | -4/+2 |
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | |||||
| * | | | | | | | Allow no-arg function invocations to use parentheses | Jon Bratseth | 2018-11-28 | 3 | -4/+2 |
| |/ / / / / / | |||||
* | | | | | | | Merge pull request #7802 from vespa-engine/mpolden/provision-lb | Morten Tokle | 2018-11-29 | 18 | -90/+102 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Provision load balancers when feature flag is set | Martin Polden | 2018-11-28 | 18 | -90/+102 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Merge pull request #7806 from vespa-engine/bratseth/avoid-server-discriminator | Henning Baldersheim | 2018-11-28 | 23 | -103/+142 |
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | |||||
| * | | | | | | Deprecate Server.getServerDiscriminator | Jon Bratseth | 2018-11-28 | 20 | -83/+118 |
| * | | | | | | Avoid usage of Sever.getServerDiscriminator | Jon Bratseth | 2018-11-28 | 6 | -20/+24 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge pull request #7797 from vespa-engine/toregge/generate-index-info-config... | Geir Storli | 2018-11-28 | 2 | -1/+23 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Don't emit unneeded index-info config for inner struct in map of struct. | Tor Egge | 2018-11-28 | 2 | -20/+4 |
| * | | | | | | Generate index info config for imported complex fields. | Tor Egge | 2018-11-28 | 2 | -1/+39 |
* | | | | | | | Merge pull request #7803 from vespa-engine/lesters/fix-concat-dimension | Lester Solbakken | 2018-11-28 | 1 | -7/+7 |
|\ \ \ \ \ \ \ |