Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Automatic commit of package [vespa] release [7.23.20-1].vespa-7.23.20-1 | by-screwdriver | 2019-03-08 | 4 | -1/+2 |
| | | | | | | Created by command: /usr/bin/tito tag --use-version=7.23.20 --no-auto-changelog | ||||
* | Merge pull request #8691 from vespa-engine/freva/add-log-handler | Valerij Fredriksen | 2019-03-06 | 1 | -0/+1 |
|\ | | | | | Add log-handler to CMakeLists | ||||
| * | Add log-handler | Valerij Fredriksen | 2019-03-06 | 1 | -0/+1 |
|/ | |||||
* | Merge pull request #8688 from vespa-engine/freva/outputstreams! | Valerij Fredriksen | 2019-03-06 | 5 | -19/+89 |
|\ | | | | | Combined and zipped outputstream | ||||
| * | Combined and zipped outputstream | Valerij Fredriksen | 2019-03-06 | 5 | -19/+89 |
| | | |||||
* | | Merge pull request #8687 from ↵ | Håkon Hallingstad | 2019-03-06 | 1 | -0/+5 |
|\ \ | | | | | | | | | | | | | vespa-engine/hakonhall/define-flag-for-upgrading-to-docker-1131-91 Define flag for upgrading to docker 1.13.1-91 | ||||
| * | | Define flag for upgrading to docker 1.13.1-91 | Håkon Hallingstad | 2019-03-06 | 1 | -0/+5 |
| | | | |||||
* | | | Merge pull request #8684 from ↵ | Valerij Fredriksen | 2019-03-06 | 3 | -27/+46 |
|\ \ \ | | | | | | | | | | | | | | | | | vespa-engine/freva/add-log-with-hostname-to-application-handler Get logs from given hostname rather than logserver node | ||||
| * | | | Get logs from given hostname rather than logserver node | Valerij Fredriksen | 2019-03-05 | 3 | -27/+46 |
| | | | | |||||
* | | | | Merge pull request #8682 from vespa-engine/freva/configurable-loghandler | Valerij Fredriksen | 2019-03-06 | 6 | -87/+88 |
|\ \ \ \ | | |_|/ | |/| | | Make LogHandler configurable | ||||
| * | | | Make LogHandler configurable | Valerij Fredriksen | 2019-03-06 | 6 | -87/+88 |
| |/ / | |||||
* | | | Merge pull request #8686 from vespa-engine/gjoranv/upgrade-dependency-plugin | Bjørn Christian Seime | 2019-03-06 | 5 | -4/+63 |
|\ \ \ | | | | | | | | | Gjoranv/upgrade dependency plugin | ||||
| * | | | Move copy-dependencies to a later phase, to allow 'mvn compile' | gjoranv | 2019-03-06 | 1 | -2/+2 |
| | | | | |||||
| * | | | Upgrade maven-dependency-plugin to 3.1.1 | gjoranv | 2019-03-06 | 5 | -2/+61 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Build jdisc_core_test test bundles right after compile phase to still allow running 'mvn test'. - Note that 'mvn compile' still fails because the integration_test module tries to copy test jars in that phase. | ||||
* | | | | Merge pull request #8683 from vespa-engine/arnej/add-sentinel-cmd | Henning Baldersheim | 2019-03-06 | 5 | -0/+153 |
|\ \ \ \ | |_|_|/ |/| | | | add skeleton for sentinel-cmd | ||||
| * | | | add skeleton for sentinel-cmd | Arne Juul | 2019-03-05 | 5 | -0/+153 |
| | | | | |||||
* | | | | Merge pull request #8679 from ↵ | Harald Musum | 2019-03-06 | 3 | -25/+2 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | vespa-engine/hmusum/do-not-set-application-name-when-creating-session Do not set application name when creating a session | ||||
| * | | | | Do not set application name when creating a session | Harald Musum | 2019-03-05 | 3 | -25/+2 |
| | |_|/ | |/| | | | | | | | | | | | | | | Remove unsupported and undocumented setting of application name when creating a session | ||||
* | | | | Merge pull request #8685 from ↵ | Bjørn Meland | 2019-03-05 | 1 | -1/+1 |
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | vespa-engine/revert-8680-jvenstad/decouple-test-framework-version-for-v4s Revert "Decouple test framework version now we're on 7" | ||||
| * | | | Revert "Decouple test framework version now we're on 7" | Harald Musum | 2019-03-05 | 1 | -1/+1 |
|/ / / | |||||
* | | | Merge pull request #8680 from ↵ | Jon Marius Venstad | 2019-03-05 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | | | | | | | | | vespa-engine/jvenstad/decouple-test-framework-version-for-v4s Decouple test framework version now we're on 7 | ||||
| * | | | Decouple test framework version now we're on 7 | Jon Marius Venstad | 2019-03-05 | 1 | -1/+1 |
|/ / / | |||||
* | | | Merge pull request #8678 from ↵ | Harald Musum | 2019-03-05 | 7 | -21/+44 |
|\ \ \ | |_|/ |/| | | | | | | | | vespa-engine/hmusum/change-deactivate-to-return-not-found-exception Deactivate should return NotFoundException | ||||
| * | | Deactivate should return NotFoundException | Harald Musum | 2019-03-05 | 7 | -21/+44 |
| | | | | | | | | | | | | Handle that internally in controller and add a test for it | ||||
* | | | Merge pull request #8670 from vespa-engine/gjoranv/use-container-service-type_2 | gjoranv | 2019-03-05 | 19 | -28/+82 |
|\ \ \ | |_|/ |/| | | Gjoranv/use container service type 2 | ||||
| * | | Import new package in config-model-api, | gjoranv | 2019-03-04 | 1 | -0/+1 |
| | | | |||||
| * | | Use ContainerServiceType in configserver. | gjoranv | 2019-03-04 | 11 | -19/+36 |
| | | | |||||
| * | | Add unit test to ensure names don't change. | gjoranv | 2019-03-04 | 1 | -0/+31 |
| | | | |||||
| * | | Rename name field to avoid confusion with Enum's 'name()' | gjoranv | 2019-03-04 | 2 | -4/+4 |
| | | | |||||
| * | | Move ContainerServiceType to config-model-api | gjoranv | 2019-03-04 | 6 | -5/+10 |
| | | | | | | | | | | | | .. to make it accessible without depending on config-model. | ||||
* | | | Merge pull request #8652 from vespa-engine/mpolden/limit-lb-service-fields | Martin Polden | 2019-03-05 | 13 | -151/+182 |
|\ \ \ | |_|/ |/| | | Limit fields that can be mutated by a LoadBalancerService | ||||
| * | | Simplify mock | Martin Polden | 2019-03-01 | 2 | -9/+8 |
| | | | |||||
| * | | Test load balancer re-activation | Martin Polden | 2019-03-01 | 2 | -0/+13 |
| | | | |||||
| * | | Simplify | Martin Polden | 2019-03-01 | 1 | -11/+9 |
| | | | |||||
| * | | Limit fields that can be mutated by a LoadBalancerService | Martin Polden | 2019-03-01 | 11 | -120/+153 |
| | | | |||||
| * | | Remove unnecessary default implementations | Martin Polden | 2019-03-01 | 2 | -14/+2 |
| | | | |||||
* | | | Merge pull request #8662 from ↵ | Harald Musum | 2019-03-05 | 1 | -4/+0 |
|\ \ \ | | | | | | | | | | | | | | | | | vespa-engine/hmusum/stop-using-name-parameter-when-creating-session Stop using 'name' request parameter, undocumented and not needed | ||||
| * | | | Stop using 'name' request parameter, undocumented and not needed | Harald Musum | 2019-03-04 | 1 | -4/+0 |
| | | | | |||||
* | | | | Merge pull request #8676 from ↵ | Håkon Hallingstad | 2019-03-04 | 5 | -17/+14 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | vespa-engine/hakonhall/use-list-instead-of-set-for-flags-rulesconditionsvalues Use List instead of Set for flags rules.conditions.values | ||||
| * | | | | Use List instead of Set for flags rules.conditions.values | Håkon Hallingstad | 2019-03-04 | 5 | -17/+14 |
| | | | | | |||||
* | | | | | Merge pull request #8674 from vespa-engine/gjoranv/setMillis-is-deprecated | Bjørn Christian Seime | 2019-03-04 | 7 | -38/+30 |
|\ \ \ \ \ | | | | | | | | | | | | | JDK 11: Replace LogRecord.setMillis with setInstant. | ||||
| * | | | | | JDK 11: Replace LogRecord.setMillis with setInstant. | gjoranv | 2019-03-04 | 7 | -38/+30 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Suppress deprecation warnings locally instead of globally in controller-server. | ||||
* | | | | | | Merge pull request #8675 from ↵ | gjoranv | 2019-03-04 | 1 | -1/+1 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | vespa-engine/revert-8672-gjoranv/upgrade-dependency-plugin Revert "Use latest maven-dependency-plugin." | ||||
| * | | | | | | Revert "Use latest maven-dependency-plugin." | gjoranv | 2019-03-04 | 1 | -1/+1 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #8667 from vespa-engine/hmusum/cleanup-config-server-tests | Harald Musum | 2019-03-04 | 2 | -96/+24 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | Move the one useful test, remove the rest | ||||
| * | | | | | Fix assert | Harald Musum | 2019-03-04 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Move the one useful test, remove the rest | Harald Musum | 2019-03-04 | 3 | -97/+24 |
| | | | | | | |||||
* | | | | | | Merge pull request #8672 from vespa-engine/gjoranv/upgrade-dependency-plugin | Bjørn Christian Seime | 2019-03-04 | 1 | -1/+1 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Use latest maven-dependency-plugin. | ||||
| * | | | | | | Use latest maven-dependency-plugin. | gjoranv | 2019-03-04 | 1 | -1/+1 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #8669 from vespa-engine/bjorncs/tls-insecure-mixed-mode | Bjørn Christian Seime | 2019-03-04 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | Bjorncs/tls insecure mixed mode |