Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | Fix Jetty NPE | Bjørn Christian Seime | 2018-09-13 | 1 | -0/+1 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #6948 from vespa-engine/hmusum/disable-allocation-of-logse... | Harald Musum | 2018-09-13 | 1 | -3/+3 | |
|\ \ \ \ \ | |_|_|/ / |/| | | | | ||||||
| * | | | | Disable using a dedicated node for logserver | Harald Musum | 2018-09-13 | 1 | -3/+3 | |
|/ / / / | ||||||
* | | | | Fix stupid filters | Jon Marius Venstad | 2018-09-13 | 1 | -2/+2 | |
* | | | | Remove unused class | Harald Musum | 2018-09-13 | 1 | -48/+0 | |
* | | | | Merge pull request #6941 from vespa-engine/toregge/extend-grouping-test-to-us... | Henning Baldersheim | 2018-09-13 | 7 | -27/+114 | |
|\ \ \ \ | ||||||
| * | | | | Test simple grouping with attribute map lookup. | Tor Egge | 2018-09-13 | 7 | -27/+114 | |
* | | | | | Merge pull request #6918 from vespa-engine/balder/only-use-id-to-compare | Henning Baldersheim | 2018-09-13 | 10 | -18/+39 | |
|\ \ \ \ \ | ||||||
| * | | | | | Use a private method to make code more readable and structured. | Henning Baldersheim | 2018-09-13 | 1 | -3/+5 | |
| * | | | | | Minor code cleanup while passing by. | Henning Baldersheim | 2018-09-12 | 4 | -13/+11 | |
| * | | | | | Identity only based on id. | Henning Baldersheim | 2018-09-12 | 4 | -2/+10 | |
| * | | | | | Just compare what is necessary for equality. | Henning Baldersheim | 2018-09-12 | 2 | -3/+16 | |
* | | | | | | Merge pull request #6940 from vespa-engine/hakonhall/document-redirect | Håkon Hallingstad | 2018-09-13 | 1 | -0/+2 | |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | ||||||
| * | | | | | Document REDIRECT | Håkon Hallingstad | 2018-09-13 | 1 | -0/+2 | |
* | | | | | | Merge pull request #6938 from vespa-engine/bjorncs/legacy-ssl-provider | Bjørn Christian Seime | 2018-09-13 | 13 | -318/+201 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Move old ssl logic for connectors into LegacySslProvider | Bjørn Christian Seime | 2018-09-13 | 13 | -318/+201 | |
| | |_|/ / / | |/| | | | | ||||||
* | | | | | | Merge pull request #6939 from vespa-engine/mortent/propagate-connector-config | Bjørn Christian Seime | 2018-09-13 | 2 | -0/+24 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Make sure connectorfactory sees similar config | Morten Tokle | 2018-09-13 | 2 | -0/+24 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #6936 from vespa-engine/hmusum/disable-setting-hosted-prop... | Harald Musum | 2018-09-13 | 1 | -0/+3 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Temporarily disable setting hosted property for config servers | Harald Musum | 2018-09-13 | 1 | -0/+3 | |
| |/ / / / / | ||||||
* | | | | | | Merge pull request #6935 from vespa-engine/jvenstad/misc | Jon Bratseth | 2018-09-13 | 1 | -2/+5 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | ||||||
| * | | | | | Correct isComplete to work also when jobs are running (and have deployed) | Jon Marius Venstad | 2018-09-13 | 1 | -2/+5 | |
* | | | | | | Allow OsUpgrader to upgrade main (#6933) | Martin Polden | 2018-09-13 | 2 | -34/+0 | |
* | | | | | | Merge pull request #6910 from vespa-engine/olaaun/tests-log-retrieval | Harald Musum | 2018-09-13 | 4 | -0/+57 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Added test for log retrieval | Ola Aunrønning | 2018-09-11 | 4 | -0/+57 | |
* | | | | | | | Merge pull request #6930 from vespa-engine/freva/systemctl-daemon-reload | Håkon Hallingstad | 2018-09-13 | 1 | -0/+6 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Add daemonReload() to SystemCtl | Valerij Fredriksen | 2018-09-12 | 1 | -0/+6 | |
* | | | | | | | | Merge pull request #6932 from vespa-engine/mortent/validate-new-ssl-config | Morten Tokle | 2018-09-13 | 1 | -0/+10 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Validate new ssl config | Morten Tokle | 2018-09-13 | 1 | -0/+10 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Merge pull request #6929 from vespa-engine/balder/replace-target-and-rename | Henning Baldersheim | 2018-09-12 | 4 | -1/+67 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Add test for proper setup and fix dirty retyping of ReferenceDataType target ... | Henning Baldersheim | 2018-09-12 | 3 | -0/+66 | |
| * | | | | | | | | Enhance array detection to avoid detecting .[document]. as an array. | Henning Baldersheim | 2018-09-12 | 1 | -1/+1 | |
* | | | | | | | | | Merge pull request #6912 from vespa-engine/havardpe/smart-buffer-in-vespalib | Håvard Pettersen | 2018-09-12 | 6 | -0/+252 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | slightly smarter buffer with test | Håvard Pettersen | 2018-09-11 | 6 | -0/+252 | |
* | | | | | | | | | | Merge pull request #6931 from vespa-engine/bjorncs/less-bouncycastle | Bjørn Christian Seime | 2018-09-12 | 2 | -3/+3 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Revert "Replace RSA with EC in unit test" | Bjørn Christian Seime | 2018-09-12 | 1 | -2/+2 | |
| * | | | | | | | | | | Revert "Use BouncyCastle as provider for JKS keystore" | Bjørn Christian Seime | 2018-09-12 | 1 | -1/+1 | |
|/ / / / / / / / / / | ||||||
* | | | | | | | | | | Merge pull request #6926 from vespa-engine/jvenstad/misc | Leandro Alves | 2018-09-12 | 1 | -3/+6 | |
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | / / / / / | | |_|_|/ / / / / | |/| | | | | | | | ||||||
| * | | | | | | | | Differentiate between waiting for slot and current deployment | Jon Marius Venstad | 2018-09-12 | 1 | -1/+4 | |
| * | | | | | | | | Add missing space in API test response | Jon Marius Venstad | 2018-09-12 | 1 | -2/+2 | |
| | |_|_|/ / / / | |/| | | | | | | ||||||
* | | | | | | | | Merge pull request #6923 from vespa-engine/hmusum/always-use-dedicated-node-f... | Jon Bratseth | 2018-09-12 | 3 | -8/+27 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Create a dedicated node for logserver when on hosted (and only in CD for now) | Harald Musum | 2018-09-12 | 3 | -8/+27 | |
* | | | | | | | | | Merge pull request #6908 from vespa-engine/bjorncs/ec-pem-support | Bjørn Christian Seime | 2018-09-12 | 23 | -1048/+46 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Use BouncyCastle as provider for JKS keystore | Bjørn Christian Seime | 2018-09-11 | 1 | -1/+1 | |
| * | | | | | | | | | Remove most deprecated types from com.yahoo.vespa.athenz.tls | Bjørn Christian Seime | 2018-09-11 | 18 | -1034/+17 | |
| * | | | | | | | | | Replace RSA with EC in unit test | Bjørn Christian Seime | 2018-09-11 | 1 | -2/+2 | |
| * | | | | | | | | | Use KeyUtils | Bjørn Christian Seime | 2018-09-11 | 1 | -7/+4 | |
| * | | | | | | | | | Support PEM serialization of EC private keys | Bjørn Christian Seime | 2018-09-11 | 2 | -4/+22 | |
* | | | | | | | | | | Merge pull request #6922 from vespa-engine/gjoranv/shade-plugin | Bjørn Christian Seime | 2018-09-12 | 1 | -18/+25 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Use shade plugin instead of assembly. | gjoranv | 2018-09-12 | 1 | -18/+25 |