Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Revert "Avoid changing API before all clients handle it" | Håkon Hallingstad | 2017-11-13 | 2 | -15/+8 |
| | |||||
* | Merge pull request #4098 from ↵ | Henning Baldersheim | 2017-11-13 | 19 | -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 Baldersheim | 2017-11-13 | 1 | -9/+1 |
| | | | | | | | | place. | ||||
| * | Avoid deleting the default tenant. | Henning Baldersheim | 2017-11-13 | 1 | -3/+3 |
| | | |||||
| * | Better parameter alignment | Henning Baldersheim | 2017-11-13 | 1 | -16/+7 |
| | | |||||
| * | Add logging when delivering file fails. | Henning Baldersheim | 2017-11-13 | 1 | -0/+4 |
| | | |||||
| * | Sleep to avoid active wait. | Henning Baldersheim | 2017-11-13 | 1 | -1/+4 |
| | | |||||
| * | Do a pragmatic retry on failed tenants. | Henning Baldersheim | 2017-11-13 | 1 | -6/+9 |
| | | |||||
| * | Pend the wiring at a better place. | Henning Baldersheim | 2017-11-13 | 2 | -3/+4 |
| | | |||||
| * | Add temporary info logging | Henning Baldersheim | 2017-11-13 | 3 | -1/+11 |
| | | |||||
| * | Revert "Revert "Wire in deployment so that we can copy the file in when the ↵ | Henning Baldersheim | 2017-11-13 | 16 | -88/+270 |
| | | | | | | | | old way i…"" | ||||
* | | Merge pull request #4090 from vespa-engine/bjorncs/custom-ssl-context | Bjørn Christian Seime | 2017-11-13 | 6 | -136/+157 |
|\ \ | |/ |/| | Bjorncs/custom ssl context | ||||
| * | Cleanup config validation mess | Bjørn Christian Seime | 2017-11-10 | 1 | -23/+26 |
| | | |||||
| * | Add TODOs | Bjørn Christian Seime | 2017-11-10 | 1 | -1/+4 |
| | | |||||
| * | Rename getKeyStore -> createPemKeyStore | Bjørn Christian Seime | 2017-11-10 | 1 | -3/+3 |
| | | |||||
| * | Move JDiscServerConnector to separate file | Bjørn Christian Seime | 2017-11-10 | 5 | -110/+125 |
| | | |||||
* | | Merge pull request #4096 from ↵ | Bjørn Christian Seime | 2017-11-13 | 15 | -366/+155 |
|\ \ | | | | | | | | | | | | | vespa-engine/bjorncs/jdisc-http-service-cleanup-remastered Bjorncs/jdisc http service cleanup remastered | ||||
| * | | Reduce log noise from HttpServerConformanceTest | Bjørn Christian Seime | 2017-11-13 | 2 | -4/+28 |
| | | | |||||
| * | | Simplify SslKeyStore interface | Bjørn Christian Seime | 2017-11-13 | 5 | -51/+35 |
| | | | |||||
| * | | Simplify PemSslKeyStore interface | Bjørn Christian Seime | 2017-11-13 | 5 | -88/+61 |
| | | | |||||
| * | | Add static modifier + fix warnings | Bjørn Christian Seime | 2017-11-13 | 2 | -22/+17 |
| | | | |||||
| * | | Remove old Manhattan keystore hack | Bjørn Christian Seime | 2017-11-13 | 4 | -203/+12 |
| | | | |||||
| * | | Add TODO on broken semantics | Bjørn Christian Seime | 2017-11-13 | 1 | -0/+1 |
| | | | |||||
| * | | Reduce log noise from unit tests | Bjørn Christian Seime | 2017-11-13 | 1 | -1/+4 |
| | | | |||||
* | | | Merge pull request #4093 from ↵ | Håvard Pettersen | 2017-11-13 | 6 | -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 Egge | 2017-11-12 | 6 | -20/+20 |
| | | | |||||
* | | | Merge pull request #4094 from vespa-engine/hmusum/wire-in-receiving-file | Henning Baldersheim | 2017-11-13 | 3 | -9/+23 |
|\ \ \ | |/ / |/| | | Wire in receiving files | ||||
| * | | Wire in receiving files | Harald Musum | 2017-11-13 | 3 | -9/+23 |
|/ / | |||||
* | | Merge pull request #4088 from ↵ | Henning Baldersheim | 2017-11-10 | 2 | -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 files | Harald Musum | 2017-11-10 | 2 | -2/+4 |
| | | | |||||
* | | | Merge pull request #4091 from ↵ | Harald Musum | 2017-11-10 | 15 | -157/+366 |
|\ \ \ | | | | | | | | | | | | | | | | | vespa-engine/revert-4072-bjorncs/jdisc-http-service-cleanup Revert "Bjorncs/jdisc http service cleanup" | ||||
| * | | | Revert "Bjorncs/jdisc http service cleanup" | Martin Polden | 2017-11-10 | 15 | -157/+366 |
|/ / / | |||||
* | | | Merge pull request #4089 from vespa-engine/jvenstad/squash-is-success-bug | Jon Bratseth | 2017-11-10 | 2 | -1/+4 |
|\ \ \ | |_|/ |/| | | Fixed condition | ||||
| * | | Fixed condition | Jon Marius Venstad | 2017-11-10 | 2 | -1/+4 |
| |/ | |||||
* | | Merge pull request #4072 from vespa-engine/bjorncs/jdisc-http-service-cleanup | gjoranv | 2017-11-10 | 15 | -366/+157 |
|\ \ | |/ |/| | Bjorncs/jdisc http service cleanup | ||||
| * | Reduce log noise from HttpServerConformanceTest | Bjørn Christian Seime | 2017-11-09 | 2 | -4/+28 |
| | | |||||
| * | Simplify SslKeyStore interface | Bjørn Christian Seime | 2017-11-09 | 5 | -51/+35 |
| | | |||||
| * | Simplify PemSslKeyStore interface | Bjørn Christian Seime | 2017-11-09 | 5 | -88/+63 |
| | | |||||
| * | Add static modifier + fix warnings | Bjørn Christian Seime | 2017-11-09 | 2 | -22/+17 |
| | | |||||
| * | Remove old Manhattan keystore hack | Bjørn Christian Seime | 2017-11-09 | 4 | -203/+12 |
| | | |||||
| * | Add TODO on broken semantics | Bjørn Christian Seime | 2017-11-09 | 1 | -0/+1 |
| | | |||||
| * | Reduce log noise from unit tests | Bjørn Christian Seime | 2017-11-09 | 1 | -1/+4 |
| | | |||||
* | | Merge pull request #4073 from vespa-engine/arnej/add-uripattern-to-bindingmatch | gjoranv | 2017-11-10 | 6 | -13/+46 |
|\ \ | | | | | | | Arnej/add uripattern to bindingmatch | ||||
| * | | mark with deprecated | Arne Juul | 2017-11-09 | 1 | -0/+2 |
| | | | |||||
| * | | fill pattern into BindingMatch | Arne Juul | 2017-11-09 | 2 | -3/+4 |
| | | | |||||
| * | | add the pattern to BindingMatch | Arne Juul | 2017-11-09 | 4 | -10/+40 |
| | | | |||||
* | | | Merge pull request #4079 from vespa-engine/mortent/athenz-send-lbaddress | Bjørn Christian Seime | 2017-11-10 | 2 | -19/+16 |
|\ \ \ | | | | | | | | | Send lbaddress in identity config | ||||
| * | | | Send lbaddress in identity config | Morten Tokle | 2017-11-10 | 2 | -19/+16 |
| | | | | |||||
* | | | | Merge pull request #4084 from ↵ | Harald Musum | 2017-11-10 | 16 | -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 Baldersheim | 2017-11-10 | 16 | -270/+88 |
| | | | | | | | | | | | | | | | | | | | | i…" |