Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | Add bouncycastle compile scope dep | Morten Tokle | 2018-02-20 | 1 | -0/+10 | |
| * | | | | | Revert "Merge pull request #5072 from vespa-engine/revert-4984-mortent/ckms" | Morten Tokle | 2018-02-20 | 21 | -294/+163 | |
* | | | | | | Merge pull request #5079 from vespa-engine/toregge/stop-using-given-and-when-... | Arne H Juul | 2018-02-20 | 1 | -67/+60 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | given/when constructs are deprecated in newer versions of perl. | Tor Egge | 2018-02-20 | 1 | -67/+60 | |
| | |/ / / / | |/| | | | | ||||||
* | | | | | | Merge pull request #5077 from vespa-engine/toregge/enable-vespa-user-override | Arne H Juul | 2018-02-20 | 2 | -1/+6 | |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | ||||||
| * | | | | | Allow override of VESPA_USER in generated default-env.txt. | Tor Egge | 2018-02-20 | 2 | -1/+6 | |
| |/ / / / | ||||||
* | | | | | Merge pull request #5078 from vespa-engine/toregge/stop-using-usleep-in-shell... | Arne H Juul | 2018-02-20 | 1 | -1/+1 | |
|\ \ \ \ \ | ||||||
| * | | | | | usleep is deprecated in shell scripts. | Tor Egge | 2018-02-20 | 1 | -1/+1 | |
| |/ / / / | ||||||
* | | | | | Merge pull request #5074 from vespa-engine/bjorncs/enable-controller-authz-fi... | Bjørn Christian Seime | 2018-02-20 | 2 | -26/+8 | |
|\ \ \ \ \ | ||||||
| * | | | | | Rename to DefaultAuthorizationResponseHandler | Bjørn Christian Seime | 2018-02-20 | 2 | -5/+8 | |
| * | | | | | Enforce authorization rules in ControllerAuthorizationFilter | Bjørn Christian Seime | 2018-02-20 | 1 | -22/+1 | |
| | |/ / / | |/| | | | ||||||
* | | | | | Merge pull request #5073 from vespa-engine/hmusum/export-package | Valerij Fredriksen | 2018-02-20 | 3 | -0/+15 | |
|\ \ \ \ \ | |/ / / / |/| | | | | ||||||
| * | | | | Export more packages | Harald Musum | 2018-02-20 | 2 | -0/+10 | |
| * | | | | Export package | Harald Musum | 2018-02-20 | 1 | -0/+5 | |
* | | | | | Merge pull request #5070 from vespa-engine/bjorncs/improve-vespa-http-client-... | Jon Bratseth | 2018-02-20 | 1 | -3/+3 | |
|\ \ \ \ \ | |_|/ / / |/| | | | | ||||||
| * | | | | Use string concat instead of logging format string | Bjørn Christian Seime | 2018-02-20 | 1 | -4/+4 | |
| * | | | | Fix bug where exception message is not included in log entry | Bjørn Christian Seime | 2018-02-19 | 1 | -4/+4 | |
* | | | | | Merge pull request #5072 from vespa-engine/revert-4984-mortent/ckms | Arnstein Ressem | 2018-02-20 | 21 | -163/+294 | |
|\ \ \ \ \ | |_|/ / / |/| | | | | ||||||
| * | | | | Revert "Refactor identityprovider. Add SiaIdentityProvider" | Morten Tokle | 2018-02-20 | 21 | -163/+294 | |
|/ / / / | ||||||
* | | | | Merge pull request #4984 from vespa-engine/mortent/ckms | Morten Tokle | 2018-02-20 | 21 | -294/+163 | |
|\ \ \ \ | ||||||
| * \ \ \ | Merge branch 'master' into mortent/ckms | Morten Tokle | 2018-02-20 | 33 | -498/+443 | |
| |\ \ \ \ | |/ / / / |/| | | | | ||||||
* | | | | | Merge pull request #5071 from vespa-engine/hmusum/file-distribution-logging-c... | Valerij Fredriksen | 2018-02-19 | 6 | -27/+28 | |
|\ \ \ \ \ | |_|_|/ / |/| | | | | ||||||
| * | | | | Reduce log level and create less garbage | Harald Musum | 2018-02-19 | 6 | -27/+28 | |
|/ / / / | ||||||
* | | | | Merge pull request #5068 from vespa-engine/hmusum/inject-config-server-client... | Harald Musum | 2018-02-19 | 2 | -18/+23 | |
|\ \ \ \ | |_|/ / |/| | | | ||||||
| * | | | Inject config server clients in DockerAdminComponent | Harald Musum | 2018-02-19 | 2 | -18/+23 | |
|/ / / | ||||||
* | | | Merge pull request #5067 from vespa-engine/mortent/relative-truststore-location | Valerij Fredriksen | 2018-02-19 | 1 | -1/+2 | |
|\ \ \ | ||||||
| * | | | relative path to truststore | Morten Tokle | 2018-02-19 | 1 | -1/+2 | |
* | | | | Merge pull request #5043 from vespa-engine/musum/remove-RuleConfigDeriver | Jon Bratseth | 2018-02-19 | 5 | -247/+0 | |
|\ \ \ \ | |/ / / |/| | | | ||||||
| * | | | Remove dead code | Harald Musum | 2018-02-15 | 5 | -247/+0 | |
* | | | | Merge pull request #5066 from vespa-engine/revert-5046-balder/remove-config-race | Henning Baldersheim | 2018-02-18 | 17 | -179/+170 | |
|\ \ \ \ | ||||||
| * | | | | Revert "Balder/remove config race" | Henning Baldersheim | 2018-02-18 | 17 | -179/+170 | |
|/ / / / | ||||||
* | | | | Merge pull request #5064 from vespa-engine/hmusum/add-configserverhost-nodety... | Harald Musum | 2018-02-17 | 3 | -18/+40 | |
|\ \ \ \ | ||||||
| * | | | | Add node type 'confighost' and use it in Environment | Harald Musum | 2018-02-16 | 3 | -18/+40 | |
* | | | | | Merge pull request #5046 from vespa-engine/balder/remove-config-race | Henning Baldersheim | 2018-02-16 | 17 | -170/+179 | |
|\ \ \ \ \ | |/ / / / |/| | | | | ||||||
| * | | | | Remove unneccessary cast. | Henning Baldersheim | 2018-02-16 | 1 | -3/+3 | |
| * | | | | Suppress unchecked. | Henning Baldersheim | 2018-02-16 | 1 | -2/+3 | |
| * | | | | Same pattern as for FileConfigSubscription | Henning Baldersheim | 2018-02-16 | 1 | -7/+2 | |
| * | | | | Do not inc gen on forced reload. | Henning Baldersheim | 2018-02-16 | 3 | -12/+10 | |
| * | | | | Test that isChangedAndReset obeys generation. | Henning Baldersheim | 2018-02-16 | 2 | -11/+26 | |
| * | | | | Let RawConfig be a ConfigInstance | Henning Baldersheim | 2018-02-16 | 4 | -27/+24 | |
| * | | | | Let RawConfig extend a ConfigInstance to avoid racy config updates in Generic... | Henning Baldersheim | 2018-02-15 | 3 | -11/+13 | |
| * | | | | Avoid unchecked warnings. | Henning Baldersheim | 2018-02-15 | 2 | -1/+2 | |
| * | | | | Ensure that updates of generation are atomic. | Henning Baldersheim | 2018-02-15 | 3 | -8/+19 | |
| * | | | | Encapsulate the configstate in one immutable object and remove the interfaces... | Henning Baldersheim | 2018-02-15 | 14 | -136/+125 | |
* | | | | | Merge pull request #5063 from vespa-engine/freva/use-shutdownNow | Valerij Fredriksen | 2018-02-16 | 1 | -1/+1 | |
|\ \ \ \ \ | ||||||
| * | | | | | Use shutdownNow() | Valerij Fredriksen | 2018-02-16 | 1 | -1/+1 | |
* | | | | | | Merge pull request #5062 from vespa-engine/hakonhall/log-deconstruction-progress | Håkon Hallingstad | 2018-02-16 | 1 | -0/+4 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | ||||||
| * | | | | | Log deconstruction progress | Håkon Hallingstad | 2018-02-16 | 1 | -0/+4 | |
* | | | | | | Merge pull request #5061 from vespa-engine/freva/executor-shutdown | Valerij Fredriksen | 2018-02-16 | 1 | -0/+1 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Shutdown executor | Valerij Fredriksen | 2018-02-16 | 1 | -0/+1 |