summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Automatic commit of package [vespa] release [7.23.20-1].vespa-7.23.20-1by-screwdriver2019-03-084-1/+2
* Merge pull request #8691 from vespa-engine/freva/add-log-handlerValerij Fredriksen2019-03-061-0/+1
|\
| * Add log-handlerValerij Fredriksen2019-03-061-0/+1
|/
* Merge pull request #8688 from vespa-engine/freva/outputstreams!Valerij Fredriksen2019-03-065-19/+89
|\
| * Combined and zipped outputstreamValerij Fredriksen2019-03-065-19/+89
* | Merge pull request #8687 from vespa-engine/hakonhall/define-flag-for-upgradin...Håkon Hallingstad2019-03-061-0/+5
|\ \
| * | Define flag for upgrading to docker 1.13.1-91Håkon Hallingstad2019-03-061-0/+5
* | | Merge pull request #8684 from vespa-engine/freva/add-log-with-hostname-to-app...Valerij Fredriksen2019-03-063-27/+46
|\ \ \
| * | | Get logs from given hostname rather than logserver nodeValerij Fredriksen2019-03-053-27/+46
* | | | Merge pull request #8682 from vespa-engine/freva/configurable-loghandlerValerij Fredriksen2019-03-066-87/+88
|\ \ \ \ | | |_|/ | |/| |
| * | | Make LogHandler configurableValerij Fredriksen2019-03-066-87/+88
| |/ /
* | | Merge pull request #8686 from vespa-engine/gjoranv/upgrade-dependency-pluginBjørn Christian Seime2019-03-065-4/+63
|\ \ \
| * | | Move copy-dependencies to a later phase, to allow 'mvn compile'gjoranv2019-03-061-2/+2
| * | | Upgrade maven-dependency-plugin to 3.1.1gjoranv2019-03-065-2/+61
* | | | Merge pull request #8683 from vespa-engine/arnej/add-sentinel-cmdHenning Baldersheim2019-03-065-0/+153
|\ \ \ \ | |_|_|/ |/| | |
| * | | add skeleton for sentinel-cmdArne Juul2019-03-055-0/+153
* | | | Merge pull request #8679 from vespa-engine/hmusum/do-not-set-application-name...Harald Musum2019-03-063-25/+2
|\ \ \ \
| * | | | Do not set application name when creating a sessionHarald Musum2019-03-053-25/+2
| | |_|/ | |/| |
* | | | Merge pull request #8685 from vespa-engine/revert-8680-jvenstad/decouple-test...Bjørn Meland2019-03-051-1/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | Revert "Decouple test framework version now we're on 7"Harald Musum2019-03-051-1/+1
|/ / /
* | | Merge pull request #8680 from vespa-engine/jvenstad/decouple-test-framework-v...Jon Marius Venstad2019-03-051-1/+1
|\ \ \
| * | | Decouple test framework version now we're on 7Jon Marius Venstad2019-03-051-1/+1
|/ / /
* | | Merge pull request #8678 from vespa-engine/hmusum/change-deactivate-to-return...Harald Musum2019-03-057-21/+44
|\ \ \ | |_|/ |/| |
| * | Deactivate should return NotFoundExceptionHarald Musum2019-03-057-21/+44
* | | Merge pull request #8670 from vespa-engine/gjoranv/use-container-service-type_2gjoranv2019-03-0519-28/+82
|\ \ \ | |_|/ |/| |
| * | Import new package in config-model-api,gjoranv2019-03-041-0/+1
| * | Use ContainerServiceType in configserver.gjoranv2019-03-0411-19/+36
| * | Add unit test to ensure names don't change.gjoranv2019-03-041-0/+31
| * | Rename name field to avoid confusion with Enum's 'name()'gjoranv2019-03-042-4/+4
| * | Move ContainerServiceType to config-model-apigjoranv2019-03-046-5/+10
* | | Merge pull request #8652 from vespa-engine/mpolden/limit-lb-service-fieldsMartin Polden2019-03-0513-151/+182
|\ \ \ | |_|/ |/| |
| * | Simplify mockMartin Polden2019-03-012-9/+8
| * | Test load balancer re-activationMartin Polden2019-03-012-0/+13
| * | SimplifyMartin Polden2019-03-011-11/+9
| * | Limit fields that can be mutated by a LoadBalancerServiceMartin Polden2019-03-0111-120/+153
| * | Remove unnecessary default implementationsMartin Polden2019-03-012-14/+2
* | | Merge pull request #8662 from vespa-engine/hmusum/stop-using-name-parameter-w...Harald Musum2019-03-051-4/+0
|\ \ \
| * | | Stop using 'name' request parameter, undocumented and not neededHarald Musum2019-03-041-4/+0
* | | | Merge pull request #8676 from vespa-engine/hakonhall/use-list-instead-of-set-...Håkon Hallingstad2019-03-045-17/+14
|\ \ \ \
| * | | | Use List instead of Set for flags rules.conditions.valuesHåkon Hallingstad2019-03-045-17/+14
* | | | | Merge pull request #8674 from vespa-engine/gjoranv/setMillis-is-deprecatedBjørn Christian Seime2019-03-047-38/+30
|\ \ \ \ \
| * | | | | JDK 11: Replace LogRecord.setMillis with setInstant.gjoranv2019-03-047-38/+30
* | | | | | Merge pull request #8675 from vespa-engine/revert-8672-gjoranv/upgrade-depend...gjoranv2019-03-041-1/+1
|\ \ \ \ \ \
| * | | | | | Revert "Use latest maven-dependency-plugin."gjoranv2019-03-041-1/+1
|/ / / / / /
* | | | | | Merge pull request #8667 from vespa-engine/hmusum/cleanup-config-server-testsHarald Musum2019-03-042-96/+24
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Fix assertHarald Musum2019-03-041-1/+1
| * | | | | Move the one useful test, remove the restHarald Musum2019-03-043-97/+24
* | | | | | Merge pull request #8672 from vespa-engine/gjoranv/upgrade-dependency-pluginBjørn Christian Seime2019-03-041-1/+1
|\ \ \ \ \ \
| * | | | | | Use latest maven-dependency-plugin.gjoranv2019-03-041-1/+1
* | | | | | | Merge pull request #8669 from vespa-engine/bjorncs/tls-insecure-mixed-modeBjørn Christian Seime2019-03-041-1/+1
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |