summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #4305 from vespa-engine/havardpe/support-mul-join-in-tempo...Tor Egge2017-11-292-70/+160
|\
| * 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
|\ \
| * | 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
* | | Merge pull request #4299 from vespa-engine/bjorncs/ssl-truststore-configuratorBjørn Christian Seime2017-11-2912-90/+240
|\ \ \
| * | | 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 vespa-engine/hmusum/remove-unused-temp-element-...Valerij Fredriksen2017-11-291-1/+0
|\ \ \ \
| * | | | Remove unused syntax for disabling file distributor, using <disableFiledistri...Harald Musum2017-11-291-1/+0
| |/ / /
* | | | Merge pull request #4292 from vespa-engine/hmusum/remove-unused-test-appgjoranv2017-11-292-15/+0
|\ \ \ \ | |_|_|/ |/| | |
| * | | Remove unused test appHarald Musum2017-11-282-15/+0
* | | | Merge pull request #4298 from vespa-engine/havardpe/clean-up-old-internal-ten...Håvard Pettersen2017-11-2916-361/+55
|\ \ \ \
| * | | | 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 vespa-engine/revert-4293-hmusum/remove-zone-fro...Morten Tokle2017-11-299-36/+42
|\ \ \ \ \
| * | | | | Revert "Remove zone from DeployProperties"Harald Musum2017-11-299-36/+42
|/ / / / /
* | | | | Merge pull request #4300 from vespa-engine/hmusum/set-sessions-path-correctly...Valerij Fredriksen2017-11-295-39/+36
|\ \ \ \ \
| * | | | | Set sessions path correctly in test constructorHarald Musum2017-11-295-39/+36
| | |_|/ / | |/| | |
* | | | | Merge pull request #4293 from vespa-engine/hmusum/remove-zone-from-DeployProp...Morten Tokle2017-11-299-42/+36
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Remove zone from DeployPropertiesHarald Musum2017-11-289-45/+36
| | |_|/ | |/| |
* | | | Merge pull request #4296 from vespa-engine/havardpe/use-binary-format-when-co...Arne H Juul2017-11-281-4/+7
|\ \ \ \
| * | | | use binary format to convert tensorsHåvard Pettersen2017-11-281-4/+7
| |/ / /
* | | | Merge pull request #4297 from vespa-engine/hmusum/rename-element-to-disable-f...Harald Musum2017-11-286-14/+13
|\ \ \ \ | |_|/ / |/| | |
| * | | Backwards compatibilityHarald Musum2017-11-281-1/+2
| * | | Rename element to disable filedistributorHarald Musum2017-11-286-15/+13
| |/ /
* | | Merge pull request #4295 from vespa-engine/havardpe/ignore-filesTor Brede Vekterli2017-11-281-0/+2
|\ \ \ | |/ / |/| |
| * | 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 calledValerij Fredriksen2017-11-281-3/+3
* | Merge pull request #4286 from vespa-engine/hmusum/more-wiring-for-disabling-f...Henning Baldersheim2017-11-287-10/+39
|\ \
| * | More wiring for making it possible to disable filedistributorHarald Musum2017-11-277-10/+39
* | | Merge pull request #4289 from vespa-engine/hmusum/write-to-temp-file-and-moveHenning Baldersheim2017-11-281-2/+5
|\ \ \
| * | | Write to temp file and move it afterwardsHarald Musum2017-11-281-2/+5
* | | | Merge pull request #4288 from vespa-engine/hmusum/make-tenants-handling-more-...Henning Baldersheim2017-11-283-12/+14
|\ \ \ \ | |_|_|/ |/| | |
| * | | Do not create system tenants in constructor. Do not put into map of tenants u...Harald Musum2017-11-273-12/+14
| |/ /
* | | Merge pull request #4287 from vespa-engine/freva/add-https-bindingsMorten Tokle2017-11-282-1/+34
|\ \ \ | |/ / |/| |
| * | Add HTTPS bindings in configserver-app services.xmlValerij Fredriksen2017-11-272-1/+34
* | | Merge pull request #4272 from vespa-engine/toregge/use-standard-locking-in-st...Geir Storli2017-11-2713-75/+94
|\ \ \
| * | | Use standard locking in BucketOperationLogger.Tor Egge2017-11-243-6/+7
| * | | Use standard locking in StorageLinkQueued.Tor Egge2017-11-242-12/+20
| * | | Remove unused code from StorageLinkQueued.Tor Egge2017-11-242-13/+0
| * | | Use standard locking in StorageComponent.Tor Egge2017-11-242-10/+10