summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | Add bouncycastle compile scope depMorten Tokle2018-02-201-0/+10
| * | | | | Revert "Merge pull request #5072 from vespa-engine/revert-4984-mortent/ckms"Morten Tokle2018-02-2021-294/+163
* | | | | | Merge pull request #5079 from vespa-engine/toregge/stop-using-given-and-when-...Arne H Juul2018-02-201-67/+60
|\ \ \ \ \ \
| * | | | | | given/when constructs are deprecated in newer versions of perl.Tor Egge2018-02-201-67/+60
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #5077 from vespa-engine/toregge/enable-vespa-user-overrideArne H Juul2018-02-202-1/+6
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Allow override of VESPA_USER in generated default-env.txt.Tor Egge2018-02-202-1/+6
| |/ / / /
* | | | | Merge pull request #5078 from vespa-engine/toregge/stop-using-usleep-in-shell...Arne H Juul2018-02-201-1/+1
|\ \ \ \ \
| * | | | | usleep is deprecated in shell scripts.Tor Egge2018-02-201-1/+1
| |/ / / /
* | | | | Merge pull request #5074 from vespa-engine/bjorncs/enable-controller-authz-fi...Bjørn Christian Seime2018-02-202-26/+8
|\ \ \ \ \
| * | | | | Rename to DefaultAuthorizationResponseHandlerBjørn Christian Seime2018-02-202-5/+8
| * | | | | Enforce authorization rules in ControllerAuthorizationFilterBjørn Christian Seime2018-02-201-22/+1
| | |/ / / | |/| | |
* | | | | Merge pull request #5073 from vespa-engine/hmusum/export-packageValerij Fredriksen2018-02-203-0/+15
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Export more packagesHarald Musum2018-02-202-0/+10
| * | | | Export packageHarald Musum2018-02-201-0/+5
* | | | | Merge pull request #5070 from vespa-engine/bjorncs/improve-vespa-http-client-...Jon Bratseth2018-02-201-3/+3
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Use string concat instead of logging format stringBjørn Christian Seime2018-02-201-4/+4
| * | | | Fix bug where exception message is not included in log entryBjørn Christian Seime2018-02-191-4/+4
* | | | | Merge pull request #5072 from vespa-engine/revert-4984-mortent/ckmsArnstein Ressem2018-02-2021-163/+294
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Revert "Refactor identityprovider. Add SiaIdentityProvider"Morten Tokle2018-02-2021-163/+294
|/ / / /
* | | | Merge pull request #4984 from vespa-engine/mortent/ckmsMorten Tokle2018-02-2021-294/+163
|\ \ \ \
| * \ \ \ Merge branch 'master' into mortent/ckmsMorten Tokle2018-02-2033-498/+443
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | 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