summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Automatic commit of package [vespa] release [6.211.26-1].vespa-6.211.26-1by-screwdriver2018-02-204-1/+2
* Merge pull request #5071 from vespa-engine/hmusum/file-distribution-logging-c...Valerij Fredriksen2018-02-196-27/+28
|\
| * Reduce log level and create less garbageHarald Musum2018-02-196-27/+28
|/
* Merge pull request #5068 from vespa-engine/hmusum/inject-config-server-client...Harald Musum2018-02-192-18/+23
|\
| * Inject config server clients in DockerAdminComponentHarald Musum2018-02-192-18/+23
|/
* Merge pull request #5067 from vespa-engine/mortent/relative-truststore-locationValerij Fredriksen2018-02-191-1/+2
|\
| * relative path to truststoreMorten Tokle2018-02-191-1/+2
* | Merge pull request #5043 from vespa-engine/musum/remove-RuleConfigDeriverJon Bratseth2018-02-195-247/+0
|\ \ | |/ |/|
| * Remove dead codeHarald Musum2018-02-155-247/+0
* | Merge pull request #5066 from vespa-engine/revert-5046-balder/remove-config-raceHenning Baldersheim2018-02-1817-179/+170
|\ \
| * | Revert "Balder/remove config race"Henning Baldersheim2018-02-1817-179/+170
|/ /
* | Merge pull request #5064 from vespa-engine/hmusum/add-configserverhost-nodety...Harald Musum2018-02-173-18/+40
|\ \
| * | Add node type 'confighost' and use it in EnvironmentHarald Musum2018-02-163-18/+40
* | | Merge pull request #5046 from vespa-engine/balder/remove-config-raceHenning Baldersheim2018-02-1617-170/+179
|\ \ \ | |/ / |/| |
| * | Remove unneccessary cast.Henning Baldersheim2018-02-161-3/+3
| * | Suppress unchecked.Henning Baldersheim2018-02-161-2/+3
| * | Same pattern as for FileConfigSubscriptionHenning Baldersheim2018-02-161-7/+2
| * | Do not inc gen on forced reload.Henning Baldersheim2018-02-163-12/+10
| * | Test that isChangedAndReset obeys generation.Henning Baldersheim2018-02-162-11/+26
| * | Let RawConfig be a ConfigInstanceHenning Baldersheim2018-02-164-27/+24
| * | Let RawConfig extend a ConfigInstance to avoid racy config updates in Generic...Henning Baldersheim2018-02-153-11/+13
| * | Avoid unchecked warnings.Henning Baldersheim2018-02-152-1/+2
| * | Ensure that updates of generation are atomic.Henning Baldersheim2018-02-153-8/+19
| * | Encapsulate the configstate in one immutable object and remove the interfaces...Henning Baldersheim2018-02-1514-136/+125
* | | Merge pull request #5063 from vespa-engine/freva/use-shutdownNowValerij Fredriksen2018-02-161-1/+1
|\ \ \
| * | | Use shutdownNow()Valerij Fredriksen2018-02-161-1/+1
* | | | Merge pull request #5062 from vespa-engine/hakonhall/log-deconstruction-progressHåkon Hallingstad2018-02-161-0/+4
|\ \ \ \ | |/ / / |/| | |
| * | | Log deconstruction progressHåkon Hallingstad2018-02-161-0/+4
* | | | Merge pull request #5061 from vespa-engine/freva/executor-shutdownValerij Fredriksen2018-02-161-0/+1
|\ \ \ \
| * | | | Shutdown executorValerij Fredriksen2018-02-161-0/+1
* | | | | Merge pull request #5060 from vespa-engine/bjorncs/controller-authorization-f...Bjørn Christian Seime2018-02-163-49/+50
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | De-duplicate code in ControllerAuthorizationFilterTestBjørn Christian Seime2018-02-161-63/+46
| * | | | Allow tenant pipelines to use application v4 promoteBjørn Christian Seime2018-02-162-0/+17
| * | | | Replace all use of deprecated jobreport API with application api equivalentBjørn Christian Seime2018-02-161-2/+3
|/ / / /
* | | | Merge pull request #5059 from vespa-engine/revert-5047-hmusum/add-configserve...Håkon Hallingstad2018-02-163-41/+19
|\ \ \ \
| * | | | Revert "Add node type confighost and use it in Environment"Harald Musum2018-02-163-41/+19
|/ / / /
* | | | Merge pull request #5056 from vespa-engine/toregge/add-json-option-to-vespa-g...Geir Storli2018-02-161-84/+203
|\ \ \ \
| * | | | Add --json option to vespa-gen-testdocs.Tor Egge2018-02-161-84/+203
* | | | | Merge pull request #5058 from vespa-engine/smorgrav/whitespace_and_special_charsHåkon Hallingstad2018-02-162-2/+19
|\ \ \ \ \
| * | | | | Include exclamation point to whiltelist and fix whitespace tokenizationtoby2018-02-162-2/+19
* | | | | | Merge pull request #5057 from vespa-engine/hmusum/install-maintenance-scriptValerij Fredriksen2018-02-161-0/+3
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Install maintenance scriptHarald Musum2018-02-161-0/+3
|/ / / / /
* | | | | Merge pull request #5054 from vespa-engine/freva/remove-dynamic-allocation-flagValerij Fredriksen2018-02-165-44/+2
|\ \ \ \ \
| * | | | | Remove dynamic docker allocation feature flagValerij Fredriksen2018-02-165-44/+2
* | | | | | Merge pull request #5052 from vespa-engine/bjorncs/application-v4-jobreportBjørn Christian Seime2018-02-164-12/+64
|\ \ \ \ \ \
| * | | | | | Log path and identity for all authz failuresBjørn Christian Seime2018-02-161-10/+21
| * | | | | | Add jobreport method to application v4 apiBjørn Christian Seime2018-02-154-2/+43
* | | | | | | Merge pull request #5053 from vespa-engine/gjoranv/add-logging-and-commentsgjoranv2018-02-162-13/+43
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Add logging and comments to container and config retriever.gjoranv2018-02-162-13/+43
* | | | | | | Merge pull request #5047 from vespa-engine/hmusum/add-configserverhost-nodetypeHarald Musum2018-02-163-19/+41
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |