summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Automatic commit of package [vespa] release [6.179.30-1].vespa-6.179.30-1by-screwdriver2017-11-304-1/+2
| | | | | | Created by command: /usr/bin/tito tag --use-version=6.179.30 --no-auto-changelog
* Merge pull request #4311 from ↵Tor Egge2017-11-291-9/+9
|\ | | | | | | | | vespa-engine/havardpe/use-tensor-match-when-possible optimize for NN bias addition
| * optimize for NN bias additionHåvard Pettersen2017-11-291-9/+9
| |
* | Merge pull request #4307 from vespa-engine/bjorncs/ssl-details-access-logBjørn Christian Seime2017-11-295-5/+29
|\ \ | | | | | | Bjorncs/ssl details access log
| * | Add ssl principal to json access logBjørn Christian Seime2017-11-291-0/+5
| | |
| * | Remove type of user principal from json logBjørn Christian Seime2017-11-291-4/+1
| | |
| * | Add client tls certificate principal to access log entryBjørn Christian Seime2017-11-294-1/+23
| |/
* | Merge pull request #4306 from ↵Valerij Fredriksen2017-11-291-3/+0
|\ \ | | | | | | | | | | | | vespa-engine/hmusum/do-not-assume-anything-about-default-tenant Do not assume anything about the default teanant, it is no longer
| * | Do not assume anything about the default teanant, it is no longerHarald Musum2017-11-291-3/+0
| | | | | | | | | | | | created when using the Tenants test constructor
* | | Merge pull request #4308 from vespa-engine/revert-4304-gjoranv/split-parentgjoranv2017-11-29110-1275/+965
|\ \ \ | |_|/ |/| | Revert "Gjoranv/split parent"
| * | Revert "Gjoranv/split parent"gjoranv2017-11-29110-1275/+965
|/ /
* | Merge pull request #4305 from ↵Tor Egge2017-11-292-70/+160
|\ \ | | | | | | | | | | | | vespa-engine/havardpe/support-mul-join-in-temporary-partial-ir-production recognize join mul as part of inner product
| * | recognize join mul as part of inner productHåvard Pettersen2017-11-292-70/+160
| | |
* | | Merge pull request #4304 from vespa-engine/gjoranv/split-parentgjoranv2017-11-29110-965/+1275
|\ \ \ | | | | | | | | Gjoranv/split parent
| * | | Use subshells for building parent poms.gjoranv2017-11-291-2/+8
| | | |
| * | | Use new version properties from container-dependency-versions.gjoranv2017-11-291-22/+22
| | | |
| * | | Use no_aop classifier for guice.gjoranv2017-11-293-0/+3
| | | |
| * | | Install new parent poms.gjoranv2017-11-291-1/+3
| | | |
| * | | Split parent + container-dependency-versions from root pom.gjoranv2017-11-29109-942/+1241
| | | | | | | | | | | | | | | | | | | | | | | | - Add missing dependencies so that all provided non-yahoo jars are listed in container-dependency-versions. - Add relativePath for all child poms of parent.
* | | | Merge pull request #4299 from vespa-engine/bjorncs/ssl-truststore-configuratorBjørn Christian Seime2017-11-2912-90/+240
|\ \ \ \ | |_|_|/ |/| | | Bjorncs/ssl truststore configurator
| * | | Refactor out duplicate codeBjørn Christian Seime2017-11-291-29/+27
| | | |
| * | | Add syntax for overriding SslTrustStoreConfigurator in services.xmlBjørn Christian Seime2017-11-285-32/+75
| | | |
| * | | Add SslTrustStoreConfigurator interface to JDiscBjørn Christian Seime2017-11-287-29/+138
| | | |
* | | | Merge pull request #4301 from ↵Valerij Fredriksen2017-11-291-1/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | vespa-engine/hmusum/remove-unused-temp-element-for-disabling-filedistributor Remove unused syntax for disabling file distributor, using <disableFi…
| * | | | Remove unused syntax for disabling file distributor, using ↵Harald Musum2017-11-291-1/+0
| |/ / / | | | | | | | | | | | | <disableFiledistributor> now
* | | | Merge pull request #4292 from vespa-engine/hmusum/remove-unused-test-appgjoranv2017-11-292-15/+0
|\ \ \ \ | |_|_|/ |/| | | Remove unused test app
| * | | Remove unused test appHarald Musum2017-11-282-15/+0
| | | |
* | | | Merge pull request #4298 from ↵Håvard Pettersen2017-11-2916-361/+55
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | vespa-engine/havardpe/clean-up-old-internal-tensor-api Havardpe/clean up old internal tensor api
| * | | | internalize tensor operation special handlingHåvard Pettersen2017-11-288-102/+22
| | | | |
| * | | | update external code (getType->type)Håvard Pettersen2017-11-283-5/+5
| | | | |
| * | | | remove tensor print/toString (use TensorSpec instead)Håvard Pettersen2017-11-288-101/+3
| | | | |
| * | | | remove unused tensor functions (add,sub,min,max)Håvard Pettersen2017-11-287-120/+0
| | | | |
| * | | | getType->type, sum->as_doubleHåvard Pettersen2017-11-2812-34/+26
| | | | |
* | | | | Merge pull request #4302 from ↵Morten Tokle2017-11-299-36/+42
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | vespa-engine/revert-4293-hmusum/remove-zone-from-DeployProperties Revert "Remove zone from DeployProperties"
| * | | | | Revert "Remove zone from DeployProperties"Harald Musum2017-11-299-36/+42
|/ / / / /
* | | | | Merge pull request #4300 from ↵Valerij Fredriksen2017-11-295-39/+36
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | vespa-engine/hmusum/set-sessions-path-correctly-in-test-constructor Set sessions path correctly in test constructor
| * | | | | Set sessions path correctly in test constructorHarald Musum2017-11-295-39/+36
| | |_|/ / | |/| | | | | | | | | | | | | No functional changes, some other minor refactorings
* | | | | Merge pull request #4293 from ↵Morten Tokle2017-11-299-42/+36
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | vespa-engine/hmusum/remove-zone-from-DeployProperties Remove zone from DeployProperties
| * | | | Remove zone from DeployPropertiesHarald Musum2017-11-289-45/+36
| | |_|/ | |/| | | | | | | | | | zone is already present in DeployState, no need to duplicate
* | | | Merge pull request #4296 from ↵Arne H Juul2017-11-281-4/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | vespa-engine/havardpe/use-binary-format-when-converting-tensors use binary format to convert tensors
| * | | | use binary format to convert tensorsHåvard Pettersen2017-11-281-4/+7
| |/ / /
* | | | Merge pull request #4297 from ↵Harald Musum2017-11-286-14/+13
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | vespa-engine/hmusum/rename-element-to-disable-filedistributor Rename element to disable filedistributor
| * | | Backwards compatibilityHarald Musum2017-11-281-1/+2
| | | |
| * | | Rename element to disable filedistributorHarald Musum2017-11-286-15/+13
| |/ / | | | | | | | | | Keep old until it is not used anymore
* | | Merge pull request #4295 from vespa-engine/havardpe/ignore-filesTor Brede Vekterli2017-11-281-0/+2
|\ \ \ | |/ / |/| | ignore generated files
| * | ignore generated filesHåvard Pettersen2017-11-281-0/+2
|/ /
* | Merge pull request #4290 from vespa-engine/freva/return-nan-first-timeHarald Musum2017-11-281-3/+3
|\ \ | |/ |/| Return NaN the first time CPU util is called
| * Return NaN the first time CPU util is calledValerij Fredriksen2017-11-281-3/+3
| |
* | Merge pull request #4286 from ↵Henning Baldersheim2017-11-287-10/+39
|\ \ | | | | | | | | | | | | vespa-engine/hmusum/more-wiring-for-disabling-filedistributor More wiring for making it possible to disable filedistributor
| * | More wiring for making it possible to disable filedistributorHarald Musum2017-11-277-10/+39
| | |