summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Automatic commit of package [vespa] release [6.282.83-1].vespa-6.282.83-1by-screwdriver2018-09-054-1/+2
* Merge pull request #6785 from vespa-engine/revert-6776-bjorncs/jetty-9.4.12Henning Baldersheim2018-09-042-7/+1
|\
| * Revert "Upgrade Jetty to version 9.4.12"Harald Musum2018-09-042-7/+1
|/
* Merge pull request #6776 from vespa-engine/bjorncs/jetty-9.4.12Henning Baldersheim2018-09-042-1/+7
|\
| * Upgrade Jetty to version 9.4.12Bjørn Christian Seime2018-09-042-1/+7
* | Merge pull request #6781 from vespa-engine/revert-6774-bratseth/handle-large-...Arnstein Ressem2018-09-0418-269/+44
|\ \
| * | Revert "Bratseth/handle large constants"Harald Musum2018-09-0418-269/+44
|/ /
* | Merge pull request #6779 from vespa-engine/gjoranv/use-new-setScaleBjørn Christian Seime2018-09-042-12/+1
|\ \
| * | Use newer setScale() that is not deprecated.gjoranv2018-09-041-1/+1
| * | Remove custom plugin configuration, inherit from parent.gjoranv2018-09-041-11/+0
|/ /
* | Merge pull request #6777 from vespa-engine/revert-6756-vekterli/add-initial-o...Håvard Pettersen2018-09-0419-1229/+0
|\ \
| * | Revert "Add initial OpenSSL CryptoEngine implementation and key/cert handling"Tor Brede Vekterli2018-09-0419-1229/+0
|/ /
* | Merge pull request #6756 from vespa-engine/vekterli/add-initial-openssl-crypt...Tor Brede Vekterli2018-09-0419-0/+1229
|\ \ | |/ |/|
| * Explicit vespalib string namespace prefixingTor Brede Vekterli2018-09-033-15/+13
| * Use correct TLSv1.2 max frame size limitsTor Brede Vekterli2018-09-032-10/+14
| * Address code review commentsTor Brede Vekterli2018-09-038-33/+50
| * Add initial OpenSSL CryptoEngine implementation and key/cert handlingTor Brede Vekterli2018-08-3119-0/+1210
* | Merge pull request #6774 from vespa-engine/bratseth/handle-large-constantsLester Solbakken2018-09-0418-44/+269
|\ \
| * | Read and resolve constants in model evaluationJon Bratseth2018-09-0317-44/+227
| * | Test importing of ml modelsJon Bratseth2018-09-034-4/+46
* | | Merge pull request #6775 from vespa-engine/revert-6771-geirst/fix-calc-of-old...Jon Bratseth2018-09-045-180/+118
|\ \ \
| * | | Revert "Geirst/fix calc of oldest flushed serial in flush engine"Jon Bratseth2018-09-045-180/+118
|/ / /
* | | Merge pull request #6771 from vespa-engine/geirst/fix-calc-of-oldest-flushed-...Henning Baldersheim2018-09-035-118/+180
|\ \ \
| * | | Extend flush complete event log message with flushed serial number of the tar...Geir Storli2018-09-033-2/+8
| * | | Add log event for when the flush engine tries to prune a flush handler.Geir Storli2018-09-033-8/+43
| * | | Ignore GC flush targets when calculating oldest flushed serial number.Geir Storli2018-09-032-17/+53
| * | | Simplify and modernize test code.Geir Storli2018-09-031-92/+77
| * | | Rename test file for flush engine.Geir Storli2018-09-032-1/+1
* | | | Merge pull request #6740 from vespa-engine/bjorncs/crypto-utilsBjørn Christian Seime2018-09-0327-20/+1665
|\ \ \ \ | |/ / / |/| | |
| * | | Add TODOBjørn Christian Seime2018-09-031-0/+1
| * | | Make serial number a BigInteger to allow for >64-bit valuesBjørn Christian Seime2018-09-034-9/+20
| * | | Use distinct subject namesBjørn Christian Seime2018-09-031-2/+2
| * | | Add helper wrapper to set csr/certificate as CABjørn Christian Seime2018-09-032-0/+8
| * | | Add 'SHA256withECDSA' as signature algorithmBjørn Christian Seime2018-09-031-0/+1
| * | | Fix typo in name of enum constantBjørn Christian Seime2018-09-032-2/+2
| * | | Use elliptic curve crypto to speed up unit testsBjørn Christian Seime2018-08-3011-29/+62
| * | | Use BouncyCastle to generate keypairsBjørn Christian Seime2018-08-301-1/+1
| * | | Copy security related utility classes from vespa-athenz to vespajlibBjørn Christian Seime2018-08-3026-0/+1573
| * | | Add BouncyCastle as provided dependencyBjørn Christian Seime2018-08-301-0/+10
| * | | Sort dependencies on scopeBjørn Christian Seime2018-08-301-20/+28
* | | | Merge pull request #6768 from vespa-engine/havardpe/fnet-crypto-testArne H Juul2018-09-037-20/+51
|\ \ \ \
| * | | | make test run fasterHåvard Pettersen2018-09-031-9/+3
| * | | | also run invoke/session tests with xor crypto engineHåvard Pettersen2018-09-036-11/+48
* | | | | Merge pull request #6767 from vespa-engine/jvenstad/show-config-generations-f...Harald Musum2018-09-032-63/+69
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Show config generation for all services in response"Jon Marius Venstad2018-09-032-63/+69
* | | | | Merge pull request #6766 from vespa-engine/hmusum/skip-config-convergence-che...Valerij Fredriksen2018-09-032-11/+20
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Skip checking config convergence for zone applicationHarald Musum2018-09-032-11/+20
* | | | | Merge pull request #6765 from vespa-engine/freva/add-host-admin-metricHarald Musum2018-09-031-1/+6
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Add temporary metric to monitor host-admin roll-outValerij Fredriksen2018-09-011-0/+3
| * | | | Set the correct role dimensionValerij Fredriksen2018-09-011-1/+3
| |/ / /