summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | Unit test inhibitionJon Bratseth2018-06-2911-25/+79
| * | Implement additional methodJon Bratseth2018-06-291-0/+6
| * | Application deployments inhibits periodic redeploys for a whileJon Bratseth2018-06-285-1/+35
* | | Merge pull request #6313 from vespa-engine/hmusum/remove-default-flavor-overrideJon Bratseth2018-06-295-49/+3
|\ \ \
| * | | Remove support for default flavor override per applicationHarald Musum2018-06-295-49/+3
|/ / /
* | | Merge pull request #6311 from vespa-engine/hmusum/build-minimal-set-of-modelsJon Bratseth2018-06-291-6/+1
|\ \ \ | |_|/ |/| |
| * | Build only the minimal set of models neededHarald Musum2018-06-291-6/+1
|/ /
* | Merge pull request #6308 from vespa-engine/hmusum/suppoert-application-delete...Harald Musum2018-06-2920-102/+310
|\ \
| * | Support deleting an application on any config serverHarald Musum2018-06-2820-102/+310
| |/
* | Merge pull request #6310 from vespa-engine/hmusum/add-exception-to-log-messageHåkon Hallingstad2018-06-291-1/+1
|\ \ | |/ |/|
| * Add exception to log message when redeploying application failsHarald Musum2018-06-291-1/+1
|/
* Merge pull request #6295 from vespa-engine/ovirtanen/tojson-in-documentOlli Virtanen2018-06-283-7/+67
|\
| * Explicit UTF-8 charsetOlli Virtanen2018-06-281-1/+6
| * Minor warning cleanupOlli Virtanen2018-06-271-4/+0
| * Include .toJson() in Document analogously to .toXml()Olli Virtanen2018-06-273-6/+65
* | Merge pull request #6307 from vespa-engine/mpolden/https-statusHarald Musum2018-06-281-0/+1
|\ \
| * | Add HTTPS binding for /statusMartin Polden2018-06-281-0/+1
|/ /
* | Merge pull request #6301 from vespa-engine/mpolden/propagate-request-timeoutHarald Musum2018-06-285-142/+225
|\ \
| * | Handle varying SocketTimeoutException messageMartin Polden2018-06-281-9/+23
| * | Add javadoc to public methodsMartin Polden2018-06-272-48/+51
| * | Rewrite other tests to use WireMockMartin Polden2018-06-272-123/+131
| * | Test response on timeoutMartin Polden2018-06-272-0/+50
| * | Use timeout from request parameterMartin Polden2018-06-274-29/+37
* | | Merge pull request #6306 from vespa-engine/mpolden/keep-version-for-non-conve...Martin Polden2018-06-284-22/+65
|\ \ \
| * | | Use current system version for non-converging system applicationsMartin Polden2018-06-284-22/+65
|/ / /
* | | Merge pull request #6302 from vespa-engine/mpolden/avoid-parsing-proxied-contentJon Bratseth2018-06-272-10/+27
|\ \ \ | |/ / |/| |
| * | Avoid parsing proxied contentMartin Polden2018-06-272-10/+27
|/ /
* | Merge pull request #6299 from vespa-engine/mpolden/system-version-change-requ...Martin Polden2018-06-279-35/+73
|\ \
| * | Ensure that config has converged before changing system versionMartin Polden2018-06-277-22/+49
| * | Skip config convergence check for AWSMartin Polden2018-06-272-13/+24
* | | Merge pull request #6300 from vespa-engine/revert-6284-arnej/try-more-than-on...Jon Marius Venstad2018-06-271-18/+12
|\ \ \
| * | | Revert "loop over all config servers"Harald Musum2018-06-271-18/+12
|/ / /
* | | Merge pull request #6297 from vespa-engine/hmusum/run-tenants-maintainer-only...Martin Polden2018-06-272-5/+24
|\ \ \
| * | | Run TenantsMaintainer only in CDHarald Musum2018-06-272-5/+24
* | | | Merge pull request #6296 from vespa-engine/hmusum/cleanup-2Jon Bratseth2018-06-271-5/+0
|\ \ \ \ | |/ / / |/| | |
| * | | Remove unused methodHarald Musum2018-06-271-5/+0
|/ / /
* | | Merge pull request #6294 from vespa-engine/gjoranv/verify-activation-packagesHarald Musum2018-06-271-51/+2
|\ \ \
| * | | Remove commented packages from test.gjoranv2018-06-271-51/+0
| * | | Add com.sun.activation packages to integration test.gjoranv2018-06-271-0/+2
| | |/ | |/|
* | | Merge pull request #6293 from vespa-engine/bratseth/increase-application-lock...Jon Bratseth2018-06-271-1/+1
|\ \ \ | |/ / |/| |
| * | We're doing more than before and things take longerJon Bratseth2018-06-271-1/+1
|/ /
* | Merge pull request #6284 from vespa-engine/arnej/try-more-than-one-configserverTor Brede Vekterli2018-06-271-12/+18
|\ \ | |/ |/|
| * loop over all config serversArne Juul2018-06-261-12/+18
* | Merge pull request #6286 from vespa-engine/mpolden/rewrite-statuspage-proxyMartin Polden2018-06-2713-177/+389
|\ \
| * | Avoid transitive dependency on undeclared libraryMartin Polden2018-06-261-7/+5
| * | Remove container-jersey2Martin Polden2018-06-261-7/+0
| * | Remove mockito-coreMartin Polden2018-06-261-6/+0
| * | Rewrite StatusPage proxyMartin Polden2018-06-2612-157/+384
* | | Merge pull request #6291 from vespa-engine/hmusum/rename-variableHarald Musum2018-06-271-5/+5
|\ \ \
| * | | Rename variableHarald Musum2018-06-271-5/+5