summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Revert "Bratseth/handle large constants take 3"Jon Bratseth2018-09-0526-272/+52
* Merge pull request #6805 from vespa-engine/bratseth/handle-large-constants-ta...Lester Solbakken2018-09-0526-52/+272
|\
| * Move ranking-constants.def to configdefinitionsJon Bratseth2018-09-0510-19/+7
| * Revert "Merge pull request #6794 from vespa-engine/revert-6788-bratseth/handl...Jon Bratseth2018-09-0520-45/+277
* | Merge pull request #6803 from vespa-engine/revert-6801-revert-6777-revert-675...Harald Musum2018-09-0520-1230/+1
|\ \
| * | Dummy commit for CLA botJon Marius Venstad2018-09-051-1/+1
| * | Revert "Add initial OpenSSL CryptoEngine implementation and key/cert handling"Jon Marius Venstad2018-09-0519-1229/+0
|/ /
* | Merge pull request #6802 from vespa-engine/gjoranv/update-cmakeBjørn Christian Seime2018-09-051-1/+0
|\ \
| * | Don't install removed def file.gjoranv2018-09-051-1/+0
|/ /
* | Merge pull request #6799 from vespa-engine/bjorncs/remove-so-linger-connectorBjørn Christian Seime2018-09-052-16/+2
|\ \
| * | SO linger is not supported for non-blocking sockets in Jetty 9.4.12 and laterBjørn Christian Seime2018-09-052-16/+2
* | | Merge pull request #6789 from vespa-engine/toregge/add-attribute-node-unit-testGeir Storli2018-09-053-0/+397
|\ \ \
| * | | Add unit test for AttributeNode.Tor Egge2018-09-043-0/+397
* | | | Merge pull request #6801 from vespa-engine/revert-6777-revert-6756-vekterli/a...Håvard Pettersen2018-09-0519-0/+1229
|\ \ \ \
| * | | | Revert "Revert "Add initial OpenSSL CryptoEngine implementation and key/cert ...Tor Brede Vekterli2018-09-0519-0/+1229
|/ / / /
* | | | Merge pull request #6793 from vespa-engine/geirst/extend-grouping-validator-t...Tor Egge2018-09-052-22/+87
|\ \ \ \
| * | | | Extend grouping validator to handle map syntax on an attribute vector.Geir Storli2018-09-042-13/+73
| * | | | Simplify setup of tests.Geir Storli2018-09-041-11/+16
* | | | | Merge pull request #6797 from vespa-engine/bratseth/add-owners-and-readmeLester Solbakken2018-09-055-18/+10
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Nonfunctional changes onlyJon Bratseth2018-09-055-18/+10
* | | | | Merge pull request #6792 from vespa-engine/gjoranv/remove-jersey1Bjørn Christian Seime2018-09-059-350/+58
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Remove config that was only used for Jersey 1.gjoranv2018-09-052-19/+2
| * | | | Remove unsupported Jersey 1 and convert unit test to Jersey 2.gjoranv2018-09-048-332/+57
* | | | | Merge pull request #6770 from vespa-engine/bjorncs/jrt-ssl-socketBjørn Christian Seime2018-09-056-7/+337
|\ \ \ \ \
| * | | | | Use drain() to unwrap multiple frames before reading from networkBjørn Christian Seime2018-09-041-1/+1
| * | | | | Use com.yahoo.jrt.Buffer to simplify buffer managementBjørn Christian Seime2018-09-041-31/+25
| * | | | | Rewrite wrap+unwrap to remove use of magic return valuesBjørn Christian Seime2018-09-041-47/+71
| * | | | | Rename SslEngine/SslSocket -> TlsCryptoEngine/TlsCryptoSocketBjørn Christian Seime2018-09-034-12/+10
| * | | | | Various fixes to SslSocketBjørn Christian Seime2018-09-031-5/+8
| * | | | | Test SslEngine in EchoTest and SessionTestBjørn Christian Seime2018-09-034-7/+56
| * | | | | Add ssl socket implementation based on SSLEngineBjørn Christian Seime2018-09-032-0/+262
* | | | | | Merge pull request #6796 from vespa-engine/jvenstad/use-minimal-nodes-for-tes...Jon Marius Venstad2018-09-052-2/+2
|\ \ \ \ \ \
| * | | | | | Use minimal container for testersJon Marius Venstad2018-09-052-2/+2
* | | | | | | Merge pull request #6784 from vespa-engine/mpolden/store-tenant-contact-infoMartin Polden2018-09-0521-191/+607
|\ \ \ \ \ \ \
| * | | | | | | Periodically update and store tenant contact informationMartin Polden2018-09-0416-117/+467
| * | | | | | | Implement application lock pattern for tenantsMartin Polden2018-09-044-62/+127
| * | | | | | | Less boxingMartin Polden2018-09-045-19/+20
* | | | | | | | Merge pull request #6791 from vespa-engine/jvenstad/add-deployments-url-to-ap...Leandro Alves2018-09-055-0/+9
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Add a URL for the deployments response in the application responseJon Marius Venstad2018-09-045-0/+9
| |/ / / / / /
* | | | | | | Merge pull request #6782 from vespa-engine/jvenstad/config-generation-detailsJon Marius Venstad2018-09-053-19/+78
|\ \ \ \ \ \ \
| * | | | | | | Log config status for each unconverged serviceJon Marius Venstad2018-09-041-7/+17
| * | | | | | | Parse and expose config generation detailsJon Marius Venstad2018-09-042-12/+61
* | | | | | | | Merge pull request #6734 from vespa-engine/hmusum/remove-AddYumRepoHarald Musum2018-09-052-130/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | AddYumRepo is not used anymore, remove itHarald Musum2018-08-302-130/+0
* | | | | | | | | Merge pull request #6795 from vespa-engine/revert-6785-revert-6776-bjorncs/je...Harald Musum2018-09-052-1/+7
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Revert "Revert "Upgrade Jetty to version 9.4.12""Henning Baldersheim2018-09-042-1/+7
* | | | | | | | | | Merge pull request #6778 from vespa-engine/bratseth/check-for-model-name-coll...Lester Solbakken2018-09-0415-19/+5128
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Check for model name collisionsJon Bratseth2018-09-0415-19/+5128
* | | | | | | | | | | Merge pull request #6790 from vespa-engine/bratseth/add-owners-and-readmeLester Solbakken2018-09-042-0/+8
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | / / / | | |_|_|_|_|_|/ / / | |/| | | | | | | |
| * | | | | | | | | Align text linesJon Bratseth2018-09-041-2/+2