summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | | | | | Add OWNERS and READMEJon Bratseth2018-09-042-0/+8
* | | | | | | Merge pull request #6783 from vespa-engine/geirst/reapply-fix-calc-of-oldest-...Henning Baldersheim2018-09-045-118/+180
|\ \ \ \ \ \ \
| * | | | | | | Extend flush complete event log message with flushed serial number of the tar...Geir Storli2018-09-043-2/+8
| * | | | | | | Add log event for when the flush engine tries to prune a flush handler.Geir Storli2018-09-043-8/+43
| * | | | | | | Ignore GC flush targets when calculating oldest flushed serial number.Geir Storli2018-09-042-17/+53
| * | | | | | | Simplify and modernize test code.Geir Storli2018-09-041-92/+77
| * | | | | | | Rename test file for flush engine.Geir Storli2018-09-042-1/+1
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge pull request #6787 from vespa-engine/balder/remove-enumvalue-interfaceHenning Baldersheim2018-09-0412-71/+5
|\ \ \ \ \ \ \
| * | | | | | | No need to take the guard to protect values only used here.Henning Baldersheim2018-09-042-22/+5
| * | | | | | | Remove getEnumValue interfaceHenning Baldersheim2018-09-0410-49/+0
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #6794 from vespa-engine/revert-6788-bratseth/handle-large-...Jon Bratseth2018-09-0420-277/+45
|\ \ \ \ \ \ \
| * | | | | | | Revert "Bratseth/handle large constants take 2"Jon Bratseth2018-09-0420-277/+45
|/ / / / / / /
* | | | | | | Merge pull request #6772 from vespa-engine/freva/fix-mount-labelValerij Fredriksen2018-09-045-15/+46
|\ \ \ \ \ \ \
| * | | | | | | Add javadocValerij Fredriksen2018-09-041-2/+9
| * | | | | | | Remove AWS hackValerij Fredriksen2018-09-031-4/+1
| * | | | | | | Use shared bind mount on shared directoriesValerij Fredriksen2018-09-031-2/+2
| * | | | | | | Create method for shared bind mountingValerij Fredriksen2018-09-034-2/+30
| * | | | | | | Reorder mounts, no changesValerij Fredriksen2018-09-031-7/+6
* | | | | | | | Merge pull request #6788 from vespa-engine/bratseth/handle-large-constants-ta...Jon Bratseth2018-09-0420-45/+277
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Export searchcore configJon Bratseth2018-09-043-2/+9
| * | | | | | | Revert "Merge pull request #6781 from vespa-engine/revert-6774-bratseth/handl...Jon Bratseth2018-09-0418-44/+269
|/ / / / / / /
* | | | | | | 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
|/ / / / / / /