summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Remove zombie codeJon Bratseth2018-11-2920-470/+74
* Merge pull request #7817 from vespa-engine/toregge/allow-zero-arg-parenthesis...Jon Bratseth2018-11-291-1/+1
|\
| * Don't allow function argument list to start with comma.Tor Egge2018-11-291-1/+1
* | Merge pull request #7816 from vespa-engine/revert-7810-revert-7808-bratseth/a...Lester Solbakken2018-11-299-54/+36
|\ \
| * | Revert "Revert "Always output tensor type in toString""Jon Bratseth2018-11-299-54/+36
|/ /
* | Merge pull request #7811 from vespa-engine/toregge/fail-duplicate-importGeir Storli2018-11-293-1/+21
|\ \
| * | Fail duplicate import of field.Tor Egge2018-11-293-1/+21
| |/
* | Merge pull request #7813 from vespa-engine/balder/investigate-adaptive-distri...Henning Baldersheim2018-11-294-13/+23
|\ \
| * | Prevent bad effects of zero search time.Henning Baldersheim2018-11-294-13/+23
* | | Merge pull request #7814 from vespa-engine/balder/use-std-steady-clockHenning Baldersheim2018-11-295-27/+12
|\ \ \
| * | | Include what you need and no more.Henning Baldersheim2018-11-295-3/+6
| * | | Use std::chrono::steady::clockHenning Baldersheim2018-11-292-24/+6
| |/ /
* | | Merge pull request #7807 from vespa-engine/bratseth/remove-nonimplemented-inf...gjoranv2018-11-293-19/+5
|\ \ \
| * | | Remove unimplemented metricsJon Bratseth2018-11-283-19/+5
* | | | Merge pull request #7801 from vespa-engine/bjorncs/tls-certificate-reloadingBjørn Christian Seime2018-11-297-30/+145
|\ \ \ \ | |_|/ / |/| | |
| * | | Add TODOBjørn Christian Seime2018-11-281-0/+1
| * | | Use TlsContext to construct TlsCryptoEngineBjørn Christian Seime2018-11-285-30/+39
| * | | Add TlsContext interface with a implementation based on tls optionsBjørn Christian Seime2018-11-282-0/+105
* | | | Merge pull request #7786 from vespa-engine/havardpe/initial-portal-codeTor Brede Vekterli2018-11-2924-0/+2070
|\ \ \ \
| * | | | initial portal codeHåvard Pettersen2018-11-2724-0/+2070
* | | | | Merge pull request #7804 from vespa-engine/balder/randomize-keysHenning Baldersheim2018-11-294-10/+49
|\ \ \ \ \
| * | | | | Follow template instantiation.Henning Baldersheim2018-11-281-1/+3
| * | | | | Use a simple and instead of div for modulo operation.Henning Baldersheim2018-11-281-1/+2
| * | | | | Reserve a large hashmap to reduce number of collisions.Henning Baldersheim2018-11-281-1/+1
| * | | | | Also test with hash_mapHenning Baldersheim2018-11-281-2/+34
| * | | | | Randomize keysHenning Baldersheim2018-11-281-5/+9
* | | | | | Merge pull request #7809 from vespa-engine/jvenstad/run-tester-on-same-versio...Jon Bratseth2018-11-291-6/+1
|\ \ \ \ \ \
| * | | | | | Get version information from a better source >_<Jon Marius Venstad2018-11-291-6/+1
* | | | | | | Merge pull request #7812 from vespa-engine/freva/re-remove-containerenvironme...Valerij Fredriksen2018-11-295-68/+3
|\ \ \ \ \ \ \
| * | | | | | | Revert "Revert "Do not set VESPA_CONFIGSERVERS in DockerOperations""Valerij Fredriksen2018-11-293-11/+3
| * | | | | | | Revert "Revert "Remove ContainerEnvironmentResolver""Valerij Fredriksen2018-11-294-53/+2
| * | | | | | | Revert "Revert "Remove unused method and variable from ConfigServerInfo""Valerij Fredriksen2018-11-291-6/+0
* | | | | | | | Merge pull request #7810 from vespa-engine/revert-7808-bratseth/always-output...Håkon Hallingstad2018-11-299-36/+54
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Revert "Always output tensor type in toString"Håkon Hallingstad2018-11-299-36/+54
|/ / / / / / /
* | | | | | | Merge pull request #7800 from vespa-engine/hmusum/remove-unused-methodHåkon Hallingstad2018-11-291-4/+0
|\ \ \ \ \ \ \
| * | | | | | | Remove unused methodHarald Musum2018-11-281-4/+0
* | | | | | | | Merge pull request #7808 from vespa-engine/bratseth/always-output-tensor-type...Lester Solbakken2018-11-299-54/+36
|\ \ \ \ \ \ \ \
| * | | | | | | | Expect tensor typeJon Bratseth2018-11-281-1/+1
| * | | | | | | | Always output tensor type in toStringJon Bratseth2018-11-288-53/+35
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge pull request #7805 from vespa-engine/bratseth/allow-zero-arg-parenthesisLester Solbakken2018-11-293-4/+2
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Allow no-arg function invocations to use parenthesesJon Bratseth2018-11-283-4/+2
| |/ / / / / /
* | | | | | | Merge pull request #7802 from vespa-engine/mpolden/provision-lbMorten Tokle2018-11-2918-90/+102
|\ \ \ \ \ \ \
| * | | | | | | Provision load balancers when feature flag is setMartin Polden2018-11-2818-90/+102
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #7806 from vespa-engine/bratseth/avoid-server-discriminatorHenning Baldersheim2018-11-2823-103/+142
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Deprecate Server.getServerDiscriminatorJon Bratseth2018-11-2820-83/+118
| * | | | | | Avoid usage of Sever.getServerDiscriminatorJon Bratseth2018-11-286-20/+24
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #7797 from vespa-engine/toregge/generate-index-info-config...Geir Storli2018-11-282-1/+23
|\ \ \ \ \ \
| * | | | | | Don't emit unneeded index-info config for inner struct in map of struct.Tor Egge2018-11-282-20/+4
| * | | | | | Generate index info config for imported complex fields.Tor Egge2018-11-282-1/+39
* | | | | | | Merge pull request #7803 from vespa-engine/lesters/fix-concat-dimensionLester Solbakken2018-11-281-7/+7
|\ \ \ \ \ \ \