Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Split parent + container-dependency-versions from root pom. | gjoranv | 2017-12-01 | 1 | -0/+1 |
| | | | | | | - Add missing dependencies so that all provided non-yahoo jars are listed in container-dependency-versions. - Add relativePath for all child poms of parent. | ||||
* | Revert "Gjoranv/split parent2" | gjoranv | 2017-11-30 | 1 | -1/+0 |
| | |||||
* | Split parent + container-dependency-versions from root pom. | gjoranv | 2017-11-30 | 1 | -0/+1 |
| | | | | | | - Add missing dependencies so that all provided non-yahoo jars are listed in container-dependency-versions. - Add relativePath for all child poms of parent. | ||||
* | 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 | ||||
* | Revert "Remove zone from DeployProperties" | Harald Musum | 2017-11-29 | 1 | -2/+5 |
| | |||||
* | 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 | ||||
* | | Remove zone from DeployProperties | Harald Musum | 2017-11-28 | 1 | -5/+2 |
|/ | | | | zone is already present in DeployState, no need to duplicate | ||||
* | Merge pull request #4286 from ↵ | Henning Baldersheim | 2017-11-28 | 4 | -9/+16 |
|\ | | | | | | | | | 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 filedistributor | Harald Musum | 2017-11-27 | 4 | -9/+16 |
| | | |||||
* | | Merge pull request #4288 from ↵ | Henning Baldersheim | 2017-11-28 | 3 | -12/+14 |
|\ \ | | | | | | | | | | | | | vespa-engine/hmusum/make-tenants-handling-more-robust Do not create system tenants in constructor. Do not put into map of t… | ||||
| * | | Do not create system tenants in constructor. Do not put into map of tenants ↵ | Harald Musum | 2017-11-27 | 3 | -12/+14 |
| |/ | | | | | | | unless absent | ||||
* | | Merge pull request #4287 from vespa-engine/freva/add-https-bindings | Morten Tokle | 2017-11-28 | 1 | -1/+33 |
|\ \ | |/ |/| | Add HTTPS bindings in configserver-app services.xml | ||||
| * | Add HTTPS bindings in configserver-app services.xml | Valerij Fredriksen | 2017-11-27 | 1 | -1/+33 |
| | | |||||
* | | Make sure file distributor is started when disable_filedistributor is unset | Harald Musum | 2017-11-27 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #4280 from ↵ | Henning Baldersheim | 2017-11-27 | 1 | -1/+1 |
|\ | | | | | | | | | vespa-engine/hmusum/add-setting-for-disabling-filedsitributor Add setting for turning off file distributor | ||||
| * | Add setting for turning off file distributor | Harald Musum | 2017-11-27 | 1 | -1/+1 |
| | | | | | | | | | | | | If set, will not start file distributor on config server host and on tenant nodes, will instead use config proxy and file distribution will be done with RPC calls between config proxy and config server | ||||
* | | Copy file in a way that preserves the content | Harald Musum | 2017-11-25 | 1 | -1/+21 |
|/ | | | | | IOUtils.copy(File, File) copies by using readers and default character set, does not work for binary files). | ||||
* | Implement chained download of file references | Harald Musum | 2017-11-23 | 3 | -6/+86 |
| | | | | | | | * A config server will download from another one (if possible) if it does not have the file itself. * Set error in connection pool when request fails * Use an empty connection pool if only one server | ||||
* | Revert "Hmusum/choose new connection if file reference not found" | Harald Musum | 2017-11-23 | 2 | -27/+5 |
| | |||||
* | Merge pull request #4261 from ↵ | Harald Musum | 2017-11-23 | 1 | -1/+1 |
|\ | | | | | | | | | vespa-engine/hmusum/handle-activeRotationProperty-missing Handle activaRotation property not being set | ||||
| * | Handle activaRotation property not being set | Harald Musum | 2017-11-23 | 1 | -1/+1 |
| | | | | | | | | | | Note that it might not be set in older config models too, so this will handle that case also | ||||
* | | Merge pull request #4260 from ↵ | Henning Baldersheim | 2017-11-23 | 2 | -5/+27 |
|\ \ | | | | | | | | | | | | | vespa-engine/hmusum/choose-new-connection-if-file-reference-not-found Hmusum/choose new connection if file reference not found | ||||
| * | | Create connection pool for file server correctly | Harald Musum | 2017-11-23 | 2 | -5/+27 |
| | | | | | | | | | | | | Use all other config servers than this one. | ||||
* | | | Print warning with stack trace when NoSuchElementException too | Harald Musum | 2017-11-23 | 1 | -1/+2 |
| |/ |/| | |||||
* | | Merge pull request #4203 from vespa-engine/mortent/identity-in-deployment | Morten Tokle | 2017-11-23 | 6 | -23/+39 |
|\ \ | |/ |/| | Move identity configuration services.xml -> deployment.xml | ||||
| * | Fix failing tests | Morten Tokle | 2017-11-23 | 6 | -23/+39 |
| | | |||||
* | | Add support for downloading from another config server | Harald Musum | 2017-11-23 | 3 | -2/+15 |
| | | | | | | | | | | | | | | If a request for a file reference cannot be fulfilled, ask another config server for the file. Handle connection errors when downloading files. Fixed bundle issues. | ||||
* | | Revert "Revert "Revert "Add support for downloading from another config ↵ | Harald Musum | 2017-11-22 | 3 | -15/+2 |
| | | | | | | | | server""" | ||||
* | | Use correct version | Harald Musum | 2017-11-21 | 1 | -1/+1 |
| | | |||||
* | | Revert "Revert "Add support for downloading from another config server"" | Harald Musum | 2017-11-21 | 3 | -2/+15 |
| | | |||||
* | | Revert "Add support for downloading from another config server" | Harald Musum | 2017-11-21 | 3 | -15/+2 |
| | | |||||
* | | Merge pull request #4221 from ↵ | Henning Baldersheim | 2017-11-21 | 3 | -2/+15 |
|\ \ | | | | | | | | | | | | | vespa-engine/hmusum/download-from-another-config-server Add support for downloading from another config server | ||||
| * | | Add support for downloading from another config server | Harald Musum | 2017-11-21 | 3 | -2/+15 |
| | | | | | | | | | | | | | | | | | | If a request for a file reference cannot be fulfilled, ask another config server for the file. Handle connection errors when downloading files. | ||||
* | | | Do not remove from queue when cancelling | Harald Musum | 2017-11-21 | 2 | -9/+12 |
|/ / | | | | | | | | | We have already drained the queue before cancelling a delayed response, so it is a bug to try to remove anything from it | ||||
* | | Merge pull request #4196 from ↵ | Jon Bratseth | 2017-11-21 | 2 | -2/+23 |
|\ \ | | | | | | | | | | | | | vespa-engine/hmusum/return-internal-server-error-when-nullpointerexception Return status code 500 and print stack trace if NullPointerException … | ||||
| * | | Log properly | Harald Musum | 2017-11-20 | 1 | -1/+2 |
| | | | |||||
| * | | Return status code 500 and print stack trace if NullPointerException is thrown | Harald Musum | 2017-11-18 | 2 | -2/+22 |
| |/ | | | | | | | | | When building a model, return 500 (as opposed to 400 now) and print stack trace when a NullPointerException is thrown | ||||
* | | Use scheduleWithFixedDelay and log at debug level | Harald Musum | 2017-11-19 | 1 | -3/+5 |
| | | |||||
* | | Periodically check for removed applications | Harald Musum | 2017-11-18 | 1 | -4/+14 |
|/ | |||||
* | Remove PaathProvider | Harald Musum | 2017-11-17 | 8 | -88/+40 |
| | | | | This is a bad neighbourhood, so try to get rid of deceptive and cheating code | ||||
* | Merge pull request #4145 from vespa-engine/mortent/add-lbaddress-name | Morten Tokle | 2017-11-16 | 3 | -12/+16 |
|\ | | | | | Add new field for loadbalancername, deprecate loadbalanceraddress | ||||
| * | Add new field for loadbalancername, deprecate loadbalanceraddress | Morten Tokle | 2017-11-15 | 3 | -12/+16 |
| | | |||||
* | | Remove unused include | Martin Polden | 2017-11-16 | 1 | -1/+0 |
| | | |||||
* | | Merge pull request #4155 from ↵ | Håkon Hallingstad | 2017-11-16 | 1 | -1/+1 |
|\ \ | | | | | | | | | | | | | vespa-engine/hmusum/log-when-application-is-removed Log when application is removed | ||||
| * | | Log when applications is removed | Harald Musum | 2017-11-16 | 1 | -1/+1 |
| |/ | | | | | | | | | Want to log here to see if this is actually called when we have issues with config model not being removed when an application is deleted. | ||||
* | | Merge pull request #4151 from vespa-engine/hmusum/cleanup-zk-paths-for-tenant | Jon Bratseth | 2017-11-16 | 11 | -111/+153 |
|\ \ | | | | | | | Hmusum/cleanup zk paths for tenant | ||||
| * | | Make naming consistent | Harald Musum | 2017-11-15 | 1 | -3/+3 |
| | | | |||||
| * | | Cleanup and simplify code related to zk paths for tenants | Harald Musum | 2017-11-15 | 11 | -111/+153 |
| |/ | | | | | | | No functional changes | ||||
* / | Include optional file access-logging.xml on configserver startup | Morten Tokle | 2017-11-16 | 1 | -0/+1 |
|/ |