summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Automatic commit of package [vespa] release [6.172.31-1].vespa-6.172.31-1by-screwdriver2017-11-144-1/+2
* Merge pull request #4105 from vespa-engine/bjorncs/bundle-plugin-testHåkon Hallingstad2017-11-132-2/+2
|\
| * Fix unstable testBjørn Christian Seime2017-11-131-1/+1
| * Use com.yahoo.vespa as artifact id of bundle-plugin-testBjørn Christian Seime2017-11-131-1/+1
* | Merge pull request #4070 from vespa-engine/freva/certificate-signerValerij Fredriksen2017-11-138-2/+478
|\ \
| * | Move (De)serializers out of servletValerij Fredriksen2017-11-103-36/+53
| * | assert* -> verify*Valerij Fredriksen2017-11-102-10/+10
| * | Store provider and certificate converter as instance fieldsValerij Fredriksen2017-11-101-3/+7
| * | CERTIFICATE_DURATION -> CERTIFICATE_EXPIRATIONValerij Fredriksen2017-11-102-3/+3
| * | Renamed filesValerij Fredriksen2017-11-103-14/+14
| * | Added javadocValerij Fredriksen2017-11-101-1/+13
| * | Supress unchecked castValerij Fredriksen2017-11-102-3/+4
| * | Add http endpoint to sign certificateValerij Fredriksen2017-11-095-2/+180
| * | Create certificate request signerValerij Fredriksen2017-11-093-0/+264
* | | Merge pull request #4100 from vespa-engine/hmusum/fix-adding-file-referenceHenning Baldersheim2017-11-133-8/+13
|\ \ \
| * | | Fix adding file referenceHarald Musum2017-11-133-8/+13
* | | | Merge pull request #4095 from vespa-engine/arnej/add-jdisc-handler-metricsgjoranv2017-11-132-3/+36
|\ \ \ \
| * | | | use timeElapsed methodArne Juul2017-11-131-1/+1
| * | | | add timeElapsed convenience methodArne Juul2017-11-131-2/+12
| * | | | add metrics for handled requestsArne Juul2017-11-131-1/+24
* | | | | Merge pull request #4097 from vespa-engine/toregge/use-std-lock-guard-instead...Geir Storli2017-11-1314-44/+43
|\ \ \ \ \
| * | | | | Use std::lock_guard instead of std::unique_lock.Tor Egge2017-11-1314-44/+43
| | |_|_|/ | |/| | |
* | | | | Merge pull request #4087 from vespa-engine/toregge/track-outdated-nodes-per-b...Geir Storli2017-11-139-226/+299
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Reference using statement in nested namespace.Tor Egge2017-11-101-2/+2
| * | | | Add using statements for OutdatedNodes and OutdatedNodesMap in nestedTor Egge2017-11-107-18/+37
| * | | | Track outdated nodes per bucket space.Tor Egge2017-11-107-219/+266
| * | | | Pass distributor bucket space to pending bucket space db transition.Tor Egge2017-11-103-7/+14
* | | | | Merge pull request #4098 from vespa-engine/balder/rewire-in-filecopy-on-deplo...Henning Baldersheim2017-11-1319-109/+295
|\ \ \ \ \
| * | | | | No longer necessary to loop as no more deletion of default tenant will take p...Henning Baldersheim2017-11-131-9/+1
| * | | | | 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 o...Henning Baldersheim2017-11-1316-88/+270
| | |/ / / | |/| | |
* | | | | Merge pull request #4090 from vespa-engine/bjorncs/custom-ssl-contextBjørn Christian Seime2017-11-136-136/+157
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | 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 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