summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Avoid changing API before all clients handle it"Håkon Hallingstad2017-11-132-15/+8
|
* Merge pull request #4098 from ↵Henning Baldersheim2017-11-1319-109/+295
|\ | | | | | | | | vespa-engine/balder/rewire-in-filecopy-on-deploy-the-new-way-rebased-1 Balder/rewire in filecopy on deploy the new way rebased 1
| * No longer necessary to loop as no more deletion of default tenant will take ↵Henning Baldersheim2017-11-131-9/+1
| | | | | | | | place.
| * Avoid deleting the default tenant.Henning Baldersheim2017-11-131-3/+3
| |
| * Better parameter alignmentHenning Baldersheim2017-11-131-16/+7
| |
| * Add logging when delivering file fails.Henning Baldersheim2017-11-131-0/+4
| |
| * Sleep to avoid active wait.Henning Baldersheim2017-11-131-1/+4
| |
| * Do a pragmatic retry on failed tenants.Henning Baldersheim2017-11-131-6/+9
| |
| * Pend the wiring at a better place.Henning Baldersheim2017-11-132-3/+4
| |
| * Add temporary info loggingHenning Baldersheim2017-11-133-1/+11
| |
| * Revert "Revert "Wire in deployment so that we can copy the file in when the ↵Henning Baldersheim2017-11-1316-88/+270
| | | | | | | | old way i…""
* | Merge pull request #4090 from vespa-engine/bjorncs/custom-ssl-contextBjørn Christian Seime2017-11-136-136/+157
|\ \ | |/ |/| Bjorncs/custom ssl context
| * Cleanup config validation messBjørn Christian Seime2017-11-101-23/+26
| |
| * Add TODOsBjørn Christian Seime2017-11-101-1/+4
| |
| * Rename getKeyStore -> createPemKeyStoreBjørn Christian Seime2017-11-101-3/+3
| |
| * Move JDiscServerConnector to separate fileBjørn Christian Seime2017-11-105-110/+125
| |
* | Merge pull request #4096 from ↵Bjørn Christian Seime2017-11-1315-366/+155
|\ \ | | | | | | | | | | | | vespa-engine/bjorncs/jdisc-http-service-cleanup-remastered Bjorncs/jdisc http service cleanup remastered
| * | Reduce log noise from HttpServerConformanceTestBjørn Christian Seime2017-11-132-4/+28
| | |
| * | Simplify SslKeyStore interfaceBjørn Christian Seime2017-11-135-51/+35
| | |
| * | Simplify PemSslKeyStore interfaceBjørn Christian Seime2017-11-135-88/+61
| | |
| * | Add static modifier + fix warningsBjørn Christian Seime2017-11-132-22/+17
| | |
| * | Remove old Manhattan keystore hackBjørn Christian Seime2017-11-134-203/+12
| | |
| * | Add TODO on broken semanticsBjørn Christian Seime2017-11-131-0/+1
| | |
| * | Reduce log noise from unit testsBjørn Christian Seime2017-11-131-1/+4
| | |
* | | Merge pull request #4093 from ↵Håvard Pettersen2017-11-136-20/+20
|\ \ \ | |/ / |/| | | | | | | | vespa-engine/toregge/use-std-lock-guard-instead-of-std-unique-lock-in-fnet Use std::lock_guard instead of std::unique_lock.
| * | Use std::lock_guard instead of std::unique_lock.Tor Egge2017-11-126-20/+20
| | |
* | | Merge pull request #4094 from vespa-engine/hmusum/wire-in-receiving-fileHenning Baldersheim2017-11-133-9/+23
|\ \ \ | |/ / |/| | Wire in receiving files
| * | Wire in receiving filesHarald Musum2017-11-133-9/+23
|/ /
* | Merge pull request #4088 from ↵Henning Baldersheim2017-11-102-2/+4
|\ \ | | | | | | | | | | | | vespa-engine/hmusum/use-config-proxy-port-if-filedistributor-disabled If filedistributor is disabled, use config proxy port to ask for files
| * | If filedistributor is disabled, use config proxy port to ask for filesHarald Musum2017-11-102-2/+4
| | |
* | | Merge pull request #4091 from ↵Harald Musum2017-11-1015-157/+366
|\ \ \ | | | | | | | | | | | | | | | | vespa-engine/revert-4072-bjorncs/jdisc-http-service-cleanup Revert "Bjorncs/jdisc http service cleanup"
| * | | Revert "Bjorncs/jdisc http service cleanup"Martin Polden2017-11-1015-157/+366
|/ / /
* | | Merge pull request #4089 from vespa-engine/jvenstad/squash-is-success-bugJon Bratseth2017-11-102-1/+4
|\ \ \ | |_|/ |/| | Fixed condition
| * | Fixed conditionJon Marius Venstad2017-11-102-1/+4
| |/
* | Merge pull request #4072 from vespa-engine/bjorncs/jdisc-http-service-cleanupgjoranv2017-11-1015-366/+157
|\ \ | |/ |/| Bjorncs/jdisc http service cleanup
| * Reduce log noise from HttpServerConformanceTestBjørn Christian Seime2017-11-092-4/+28
| |
| * Simplify SslKeyStore interfaceBjørn Christian Seime2017-11-095-51/+35
| |
| * Simplify PemSslKeyStore interfaceBjørn Christian Seime2017-11-095-88/+63
| |
| * Add static modifier + fix warningsBjørn Christian Seime2017-11-092-22/+17
| |
| * Remove old Manhattan keystore hackBjørn Christian Seime2017-11-094-203/+12
| |
| * Add TODO on broken semanticsBjørn Christian Seime2017-11-091-0/+1
| |
| * Reduce log noise from unit testsBjørn Christian Seime2017-11-091-1/+4
| |
* | Merge pull request #4073 from vespa-engine/arnej/add-uripattern-to-bindingmatchgjoranv2017-11-106-13/+46
|\ \ | | | | | | Arnej/add uripattern to bindingmatch
| * | mark with deprecatedArne Juul2017-11-091-0/+2
| | |
| * | fill pattern into BindingMatchArne Juul2017-11-092-3/+4
| | |
| * | add the pattern to BindingMatchArne Juul2017-11-094-10/+40
| | |
* | | Merge pull request #4079 from vespa-engine/mortent/athenz-send-lbaddressBjørn Christian Seime2017-11-102-19/+16
|\ \ \ | | | | | | | | Send lbaddress in identity config
| * | | Send lbaddress in identity configMorten Tokle2017-11-102-19/+16
| | | |
* | | | Merge pull request #4084 from ↵Harald Musum2017-11-1016-270/+88
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | vespa-engine/revert-4067-balder/wire-in-filecopy-on-deploy-the-new-way Revert "Wire in deployment so that we can copy the file in when the old way i…"
| * | | | Revert "Wire in deployment so that we can copy the file in when the old way ↵Henning Baldersheim2017-11-1016-270/+88
| | | | | | | | | | | | | | | | | | | | i…"