summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Use std::lock_guard instead of std::unique_lock.Tor Egge2017-11-1314-44/+43
* Merge pull request #4096 from vespa-engine/bjorncs/jdisc-http-service-cleanup...Bjørn Christian Seime2017-11-1315-366/+155
|\
| * 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 vespa-engine/toregge/use-std-lock-guard-instead...Håvard Pettersen2017-11-136-20/+20
|\ \ | |/ |/|
| * 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 filesHarald Musum2017-11-133-9/+23
|/
* Merge pull request #4088 from vespa-engine/hmusum/use-config-proxy-port-if-fi...Henning Baldersheim2017-11-102-2/+4
|\
| * If filedistributor is disabled, use config proxy port to ask for filesHarald Musum2017-11-102-2/+4
* | Merge pull request #4091 from vespa-engine/revert-4072-bjorncs/jdisc-http-ser...Harald Musum2017-11-1015-157/+366
|\ \
| * | 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 conditionJon Marius Venstad2017-11-102-1/+4
| |/
* | Merge pull request #4072 from vespa-engine/bjorncs/jdisc-http-service-cleanupgjoranv2017-11-1015-366/+157
|\ \ | |/ |/|
| * 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
|\ \
| * | 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 configMorten Tokle2017-11-102-19/+16
* | | | Merge pull request #4084 from vespa-engine/revert-4067-balder/wire-in-filecop...Harald Musum2017-11-1016-270/+88
|\ \ \ \
| * | | | Revert "Wire in deployment so that we can copy the file in when the old way i...Henning Baldersheim2017-11-1016-270/+88
* | | | | Merge pull request #4083 from vespa-engine/revert-4082-revert-4081-hmusum/add...Harald Musum2017-11-105-37/+78
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Revert "Revert "Add 'disabled' option for filedistribution""Harald Musum2017-11-105-37/+78
|/ / / /
* | | | Merge pull request #4082 from vespa-engine/revert-4081-hmusum/add-option-to-d...Henning Baldersheim2017-11-105-78/+37
|\ \ \ \
| * | | | Revert "Add 'disabled' option for filedistribution"Henning Baldersheim2017-11-105-78/+37
|/ / / /
* | | | Merge pull request #4081 from vespa-engine/hmusum/add-option-to-disable-filed...Henning Baldersheim2017-11-105-37/+78
|\ \ \ \
| * | | | Add 'disabled' option for filedistributionHarald Musum2017-11-105-37/+78
* | | | | Merge pull request #4067 from vespa-engine/balder/wire-in-filecopy-on-deploy-...Henning Baldersheim2017-11-1016-88/+270
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Disable double addFile as legacy code has not been verified yet.Henning Baldersheim2017-11-101-1/+2
| * | | | Wire in deployment so that we can copy the file in when the old way is gone.Henning Baldersheim2017-11-0916-88/+269
* | | | | Merge pull request #4077 from vespa-engine/hmusum/split-out-filedistribution-...Henning Baldersheim2017-11-106-121/+178
|\ \ \ \ \
| * | | | | Split out file distribution RPC methods into its own classHarald Musum2017-11-106-121/+178
* | | | | | Merge pull request #4068 from vespa-engine/geirst/add-replay-operation-cost-t...Henning Baldersheim2017-11-107-30/+72
|\ \ \ \ \ \
| * | | | | | Incorporate replay cost of a single operation in prepare restart flush strategy.Geir Storli2017-11-097-30/+72
* | | | | | | Merge pull request #4078 from vespa-engine/hmusum/cleanup-for-unused-dirsArnstein Ressem2017-11-102-12/+3
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Remove handling of directories that are not in use anymoreHarald Musum2017-11-102-12/+3