summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Automatic commit of package [vespa] release [6.310.38-1].vespa-6.310.38-1by-screwdriver2018-11-124-1/+2
* Merge pull request #7624 from vespa-engine/jvenstad/package-gc-fixJon Marius Venstad2018-11-102-10/+15
|\
| * Move deletion of all packages to deletion of applicationJon Marius Venstad2018-11-102-2/+2
| * Move pruning to separate methodJon Marius Venstad2018-11-101-8/+13
|/
* Merge pull request #7621 from vespa-engine/revert-7616-bjorncs/maven-dependen...gjoranv2018-11-091-1/+1
|\
| * Revert "Update maven-dependency-plugin to 3.1.1"Bjørn Christian Seime2018-11-091-1/+1
|/
* Merge pull request #7616 from vespa-engine/bjorncs/maven-dependency-plugingjoranv2018-11-091-1/+1
|\
| * Update maven-dependency-plugin to 3.1.1Bjørn Christian Seime2018-11-091-1/+1
* | Merge pull request #7610 from vespa-engine/jvenstad/application-package-gc-2Jon Marius Venstad2018-11-0910-110/+156
|\ \
| * | Move application package deletion out of job type loopJon Marius Venstad2018-11-091-3/+4
| * | Name and doc changesJon Marius Venstad2018-11-096-28/+32
| * | Add methods for deleting all packages of an applicationJon Marius Venstad2018-11-093-0/+18
| * | One more usageJon Marius Venstad2018-11-092-4/+4
| * | Introduce and use TesterIdJon Marius Venstad2018-11-0910-91/+114
* | | Merge pull request #7615 from vespa-engine/freva/set-zookeeper-idValerij Fredriksen2018-11-095-33/+156
|\ \ \
| * | | Add VESPA_CONFIGSERVER_ZOOKEEPER_IDSValerij Fredriksen2018-11-095-33/+156
* | | | Merge pull request #7617 from vespa-engine/arnej/handle-header-body-reconfigu...Henning Baldersheim2018-11-091-23/+18
|\ \ \ \ | |_|_|/ |/| | |
| * | | do reserialization in more casesArne Juul2018-11-091-23/+18
* | | | Merge pull request #7609 from vespa-engine/hmusum/remove-unused-def-filesValerij Fredriksen2018-11-094-108/+0
|\ \ \ \
| * | | | Remove unused def filesHarald Musum2018-11-094-108/+0
| |/ / /
* | | | Merge pull request #7611 from vespa-engine/revert-7603-hmusum/support-replaci...Valerij Fredriksen2018-11-091-10/+0
|\ \ \ \
| * | | | Revert "Support flag for replacing an array when overriding config, part 1"Harald Musum2018-11-091-10/+0
| |/ / /
* | | | Merge pull request #7612 from vespa-engine/hakonhall/avoid-stacktrace-in-log-...Håkon Hallingstad2018-11-094-8/+71
|\ \ \ \
| * | | | Avoid stacktrace in log on timeoutsHåkon Hallingstad2018-11-094-8/+71
* | | | | Merge pull request #7594 from vespa-engine/balder/correct-coverage-reporting-...Henning Baldersheim2018-11-0911-27/+200
|\ \ \ \ \
| * | | | | Refactor to make coverage testable and test it.Henning Baldersheim2018-11-0811-30/+200
| * | | | | properly compute coverage on adaptive timeout.Henning Baldersheim2018-11-071-2/+5
* | | | | | Merge pull request #7607 from vespa-engine/balder/minor-code-cleanup-while-re...Håvard Pettersen2018-11-094-13/+13
|\ \ \ \ \ \
| * | | | | | = deafult and c++11 for loopsHenning Baldersheim2018-11-091-4/+4
| * | | | | | = deafult and 0 -> nullptrHenning Baldersheim2018-11-091-1/+1
| * | | | | | = deafult and 0 -> nullptrHenning Baldersheim2018-11-092-8/+8
| |/ / / / /
* | | | | | Merge pull request #7613 from vespa-engine/havardpe/detect-eof-during-tls-det...Bjørn Christian Seime2018-11-091-1/+3
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | detect eof during tls handshake detectionHåvard Pettersen2018-11-091-1/+3
|/ / / / /
* | | | / Split Organization to two classes. Add contact info for all tenants. Add queu...olaaun2018-11-0930-342/+369
| |_|_|/ |/| | |
* | | | Merge pull request #7600 from vespa-engine/hmusum/add-configgen-to-modulesHarald Musum2018-11-091-4/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | Add back configgen to modules, is built by bootstrap.shHarald Musum2018-11-091-1/+0
| * | | Add configgen to modules and clean up a bitHarald Musum2018-11-082-4/+2
* | | | Merge pull request #7604 from vespa-engine/jvenstad/application-store-GCJon Marius Venstad2018-11-0832-87/+107
|\ \ \ \ | |_|_|/ |/| | |
| * | | testerOfJon Marius Venstad2018-11-081-1/+1
| * | | Actually do the GCJon Marius Venstad2018-11-081-0/+10
| * | | Update more users of ApplicationStore >_<Jon Marius Venstad2018-11-081-2/+2
| * | | Remove unused codeJon Marius Venstad2018-11-082-24/+0
| * | | Add method for GC in ApplicationStore, and update mockJon Marius Venstad2018-11-082-8/+39
| * | | Update users, tooJon Marius Venstad2018-11-083-6/+6
| * | | Use ApplicationVersion instead of String keys in ApplicationStoreJon Marius Venstad2018-11-082-10/+13
| * | | Move SourceRevision and ApplicationVersion to controller-apiJon Marius Venstad2018-11-0828-39/+39
* | | | Merge pull request #7603 from vespa-engine/hmusum/support-replacing-array-whe...Valerij Fredriksen2018-11-081-0/+10
|\ \ \ \
| * | | | Support flag for replacing an array when overriding config, part 1Harald Musum2018-11-081-0/+10
| | |/ / | |/| |
* | | | Merge pull request #7599 from vespa-engine/havardpe/fs4-disable-tlsTor Brede Vekterli2018-11-082-2/+2
|\ \ \ \
| * | | | disable encryption for fs4 protocol in C++Håvard Pettersen2018-11-082-2/+2