Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Split parent + container-dependency-versions from root pom. | gjoranv | 2017-11-30 | 109 | -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 #4315 from ↵ | Valerij Fredriksen | 2017-11-30 | 1 | -1/+1 |
|\ | | | | | | | | | vespa-engine/hmusum/log-stacktrace-when-ioexception Print stack trace when failing to write file | ||||
| * | Print stack trace when failing to write file | Harald Musum | 2017-11-30 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #4314 from ↵ | Valerij Fredriksen | 2017-11-30 | 3 | -13/+16 |
|\ \ | | | | | | | | | | | | | vespa-engine/hmusum/add-config-producer-to-constructor-args Create Admin with filedistribution config producer | ||||
| * | | Create Admin with filedistritbution config producer | Harald Musum | 2017-11-30 | 3 | -13/+16 |
| |/ | | | | | | | Supply it in constructor instead of setting it afterwards | ||||
* | | Merge pull request #4303 from ↵ | Henning Baldersheim | 2017-11-30 | 7 | -52/+124 |
|\ \ | |/ |/| | | | | | vespa-engine/toregge/prune-tls-as-part-of-prepare-for-restart Prune tls as part of prepare for restart | ||||
| * | Make flushDone() wait until scheduled task has been handled. | Tor Egge | 2017-11-29 | 3 | -6/+7 |
| | | | | | | | | Simplify locking by taking strategyGuard within getSortedTargetList(). | ||||
| * | Adjust comments for flushDone() method (called by flush scheduler thread). | Tor Egge | 2017-11-29 | 2 | -2/+2 |
| | | |||||
| * | Add unit tests for transaction log pruning when closing flush engine and | Tor Egge | 2017-11-29 | 1 | -9/+55 |
| | | | | | | | | when completing priority flush strategy. | ||||
| * | Log event each time transaction log is pruned. | Tor Egge | 2017-11-29 | 3 | -0/+17 |
| | | |||||
| * | Try to prune tls when shutting down flush engine or when completing | Tor Egge | 2017-11-28 | 1 | -0/+3 |
| | | | | | | | | handling of a priority flush strategy. | ||||
| * | Use standard locking in FlushEngine. | Tor Egge | 2017-11-28 | 2 | -38/+43 |
| | | |||||
* | | Merge pull request #4311 from ↵ | Tor Egge | 2017-11-29 | 1 | -9/+9 |
|\ \ | | | | | | | | | | | | | vespa-engine/havardpe/use-tensor-match-when-possible optimize for NN bias addition | ||||
| * | | optimize for NN bias addition | Håvard Pettersen | 2017-11-29 | 1 | -9/+9 |
| | | | |||||
* | | | Merge pull request #4307 from vespa-engine/bjorncs/ssl-details-access-log | Bjørn Christian Seime | 2017-11-29 | 5 | -5/+29 |
|\ \ \ | | | | | | | | | Bjorncs/ssl details access log | ||||
| * | | | Add ssl principal to json access log | Bjørn Christian Seime | 2017-11-29 | 1 | -0/+5 |
| | | | | |||||
| * | | | Remove type of user principal from json log | Bjørn Christian Seime | 2017-11-29 | 1 | -4/+1 |
| | | | | |||||
| * | | | Add client tls certificate principal to access log entry | Bjørn Christian Seime | 2017-11-29 | 4 | -1/+23 |
| |/ / | |||||
* | | | Merge pull request #4306 from ↵ | Valerij Fredriksen | 2017-11-29 | 1 | -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 longer | Harald Musum | 2017-11-29 | 1 | -3/+0 |
| | | | | | | | | | | | | | | | | created when using the Tenants test constructor | ||||
* | | | | Merge pull request #4308 from vespa-engine/revert-4304-gjoranv/split-parent | gjoranv | 2017-11-29 | 110 | -1275/+965 |
|\ \ \ \ | |_|/ / |/| | | | Revert "Gjoranv/split parent" | ||||
| * | | | Revert "Gjoranv/split parent" | gjoranv | 2017-11-29 | 110 | -1275/+965 |
|/ / / | |||||
* | | | Merge pull request #4305 from ↵ | Tor Egge | 2017-11-29 | 2 | -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 product | Håvard Pettersen | 2017-11-29 | 2 | -70/+160 |
| | | | | |||||
* | | | | Merge pull request #4304 from vespa-engine/gjoranv/split-parent | gjoranv | 2017-11-29 | 110 | -965/+1275 |
|\ \ \ \ | | | | | | | | | | | Gjoranv/split parent | ||||
| * | | | | Use subshells for building parent poms. | gjoranv | 2017-11-29 | 1 | -2/+8 |
| | | | | | |||||
| * | | | | Use new version properties from container-dependency-versions. | gjoranv | 2017-11-29 | 1 | -22/+22 |
| | | | | | |||||
| * | | | | Use no_aop classifier for guice. | gjoranv | 2017-11-29 | 3 | -0/+3 |
| | | | | | |||||
| * | | | | Install new parent poms. | gjoranv | 2017-11-29 | 1 | -1/+3 |
| | | | | | |||||
| * | | | | Split parent + container-dependency-versions from root pom. | gjoranv | 2017-11-29 | 109 | -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-configurator | Bjørn Christian Seime | 2017-11-29 | 12 | -90/+240 |
|\ \ \ \ | |_|_|/ |/| | | | Bjorncs/ssl truststore configurator | ||||
| * | | | Refactor out duplicate code | Bjørn Christian Seime | 2017-11-29 | 1 | -29/+27 |
| | | | | |||||
| * | | | Add syntax for overriding SslTrustStoreConfigurator in services.xml | Bjørn Christian Seime | 2017-11-28 | 5 | -32/+75 |
| | | | | |||||
| * | | | Add SslTrustStoreConfigurator interface to JDisc | Bjørn Christian Seime | 2017-11-28 | 7 | -29/+138 |
| | | | | |||||
* | | | | Merge pull request #4301 from ↵ | Valerij Fredriksen | 2017-11-29 | 1 | -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 Musum | 2017-11-29 | 1 | -1/+0 |
| |/ / / | | | | | | | | | | | | | <disableFiledistributor> now | ||||
* | | | | Merge pull request #4292 from vespa-engine/hmusum/remove-unused-test-app | gjoranv | 2017-11-29 | 2 | -15/+0 |
|\ \ \ \ | |_|_|/ |/| | | | Remove unused test app | ||||
| * | | | Remove unused test app | Harald Musum | 2017-11-28 | 2 | -15/+0 |
| | | | | |||||
* | | | | Merge pull request #4298 from ↵ | Håvard Pettersen | 2017-11-29 | 16 | -361/+55 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | vespa-engine/havardpe/clean-up-old-internal-tensor-api Havardpe/clean up old internal tensor api | ||||
| * | | | | internalize tensor operation special handling | Håvard Pettersen | 2017-11-28 | 8 | -102/+22 |
| | | | | | |||||
| * | | | | update external code (getType->type) | Håvard Pettersen | 2017-11-28 | 3 | -5/+5 |
| | | | | | |||||
| * | | | | remove tensor print/toString (use TensorSpec instead) | Håvard Pettersen | 2017-11-28 | 8 | -101/+3 |
| | | | | | |||||
| * | | | | remove unused tensor functions (add,sub,min,max) | Håvard Pettersen | 2017-11-28 | 7 | -120/+0 |
| | | | | | |||||
| * | | | | getType->type, sum->as_double | Håvard Pettersen | 2017-11-28 | 12 | -34/+26 |
| | | | | | |||||
* | | | | | Merge pull request #4302 from ↵ | Morten Tokle | 2017-11-29 | 9 | -36/+42 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | vespa-engine/revert-4293-hmusum/remove-zone-from-DeployProperties Revert "Remove zone from DeployProperties" | ||||
| * | | | | | Revert "Remove zone from DeployProperties" | Harald Musum | 2017-11-29 | 9 | -36/+42 |
|/ / / / / | |||||
* | | | | | Merge pull request #4300 from ↵ | Valerij Fredriksen | 2017-11-29 | 5 | -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 constructor | Harald Musum | 2017-11-29 | 5 | -39/+36 |
| | |_|/ / | |/| | | | | | | | | | | | | | No functional changes, some other minor refactorings | ||||
* | | | | | Merge pull request #4293 from ↵ | Morten Tokle | 2017-11-29 | 9 | -42/+36 |
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | vespa-engine/hmusum/remove-zone-from-DeployProperties Remove zone from DeployProperties | ||||
| * | | | | Remove zone from DeployProperties | Harald Musum | 2017-11-28 | 9 | -45/+36 |
| | |_|/ | |/| | | | | | | | | | | zone is already present in DeployState, no need to duplicate |