summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Revert "Gjoranv/split parent2"gjoranv2017-11-30110-1275/+965
* Merge pull request #4318 from vespa-engine/gjoranv/split-parent2gjoranv2017-11-30110-965/+1275
|\
| * Use new version properties from container-dependency-versions.gjoranv2017-11-301-22/+22
| * Use no_aop classifier for guice.gjoranv2017-11-303-0/+3
| * Install new parent poms.gjoranv2017-11-301-1/+9
| * Split parent + container-dependency-versions from root pom.gjoranv2017-11-30109-942/+1241
* | Merge pull request #4309 from vespa-engine/mpolden/move-rotation-to-applicationMartin Polden2017-11-3031-708/+747
|\ \
| * | Move rotation to applicationMartin Polden2017-11-2930-691/+728
| * | Make ControllerDb an interfaceMartin Polden2017-11-282-19/+19
* | | Merge pull request #4312 from vespa-engine/havardpe/optimize-vector-concatArne H Juul2017-11-302-0/+43
|\ \ \ | |_|/ |/| |
| * | optimize vector concatHåvard Pettersen2017-11-292-0/+43
* | | Merge pull request #4315 from vespa-engine/hmusum/log-stacktrace-when-ioexcep...Valerij Fredriksen2017-11-301-1/+1
|\ \ \
| * | | Print stack trace when failing to write fileHarald Musum2017-11-301-1/+1
| |/ /
* | | Merge pull request #4314 from vespa-engine/hmusum/add-config-producer-to-cons...Valerij Fredriksen2017-11-303-13/+16
|\ \ \
| * | | Create Admin with filedistritbution config producerHarald Musum2017-11-303-13/+16
| |/ /
* | | Merge pull request #4303 from vespa-engine/toregge/prune-tls-as-part-of-prepa...Henning Baldersheim2017-11-307-52/+124
|\ \ \ | |/ / |/| |
| * | Make flushDone() wait until scheduled task has been handled.Tor Egge2017-11-293-6/+7
| * | Adjust comments for flushDone() method (called by flush scheduler thread).Tor Egge2017-11-292-2/+2
| * | Add unit tests for transaction log pruning when closing flush engine andTor Egge2017-11-291-9/+55
| * | Log event each time transaction log is pruned.Tor Egge2017-11-293-0/+17
| * | Try to prune tls when shutting down flush engine or when completingTor Egge2017-11-281-0/+3
| * | Use standard locking in FlushEngine.Tor Egge2017-11-282-38/+43
* | | Merge pull request #4311 from vespa-engine/havardpe/use-tensor-match-when-pos...Tor Egge2017-11-291-9/+9
|\ \ \
| * | | 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
|\ \ \ \
| * | | | 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 vespa-engine/hmusum/do-not-assume-anything-abou...Valerij Fredriksen2017-11-291-3/+0
|\ \ \ \
| * | | | Do not assume anything about the default teanant, it is no longerHarald Musum2017-11-291-3/+0
* | | | | Merge pull request #4308 from vespa-engine/revert-4304-gjoranv/split-parentgjoranv2017-11-29110-1275/+965
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Revert "Gjoranv/split parent"gjoranv2017-11-29110-1275/+965
|/ / / /
* | | | 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