summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | Fix Jetty NPEBjørn Christian Seime2018-09-131-0/+1
|/ / / / /
* | | | | Merge pull request #6948 from vespa-engine/hmusum/disable-allocation-of-logse...Harald Musum2018-09-131-3/+3
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Disable using a dedicated node for logserverHarald Musum2018-09-131-3/+3
|/ / / /
* | | | Fix stupid filtersJon Marius Venstad2018-09-131-2/+2
* | | | Remove unused classHarald Musum2018-09-131-48/+0
* | | | Merge pull request #6941 from vespa-engine/toregge/extend-grouping-test-to-us...Henning Baldersheim2018-09-137-27/+114
|\ \ \ \
| * | | | Test simple grouping with attribute map lookup.Tor Egge2018-09-137-27/+114
* | | | | Merge pull request #6918 from vespa-engine/balder/only-use-id-to-compareHenning Baldersheim2018-09-1310-18/+39
|\ \ \ \ \
| * | | | | Use a private method to make code more readable and structured.Henning Baldersheim2018-09-131-3/+5
| * | | | | Minor code cleanup while passing by.Henning Baldersheim2018-09-124-13/+11
| * | | | | Identity only based on id.Henning Baldersheim2018-09-124-2/+10
| * | | | | Just compare what is necessary for equality.Henning Baldersheim2018-09-122-3/+16
* | | | | | Merge pull request #6940 from vespa-engine/hakonhall/document-redirectHåkon Hallingstad2018-09-131-0/+2
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Document REDIRECTHåkon Hallingstad2018-09-131-0/+2
* | | | | | Merge pull request #6938 from vespa-engine/bjorncs/legacy-ssl-providerBjørn Christian Seime2018-09-1313-318/+201
|\ \ \ \ \ \
| * | | | | | Move old ssl logic for connectors into LegacySslProviderBjørn Christian Seime2018-09-1313-318/+201
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #6939 from vespa-engine/mortent/propagate-connector-configBjørn Christian Seime2018-09-132-0/+24
|\ \ \ \ \ \
| * | | | | | Make sure connectorfactory sees similar configMorten Tokle2018-09-132-0/+24
|/ / / / / /
* | | | | | Merge pull request #6936 from vespa-engine/hmusum/disable-setting-hosted-prop...Harald Musum2018-09-131-0/+3
|\ \ \ \ \ \
| * | | | | | Temporarily disable setting hosted property for config serversHarald Musum2018-09-131-0/+3
| |/ / / / /
* | | | | | Merge pull request #6935 from vespa-engine/jvenstad/miscJon Bratseth2018-09-131-2/+5
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Correct isComplete to work also when jobs are running (and have deployed)Jon Marius Venstad2018-09-131-2/+5
* | | | | | Allow OsUpgrader to upgrade main (#6933)Martin Polden2018-09-132-34/+0
* | | | | | Merge pull request #6910 from vespa-engine/olaaun/tests-log-retrievalHarald Musum2018-09-134-0/+57
|\ \ \ \ \ \
| * | | | | | Added test for log retrievalOla Aunrønning2018-09-114-0/+57
* | | | | | | Merge pull request #6930 from vespa-engine/freva/systemctl-daemon-reloadHåkon Hallingstad2018-09-131-0/+6
|\ \ \ \ \ \ \
| * | | | | | | Add daemonReload() to SystemCtlValerij Fredriksen2018-09-121-0/+6
* | | | | | | | Merge pull request #6932 from vespa-engine/mortent/validate-new-ssl-configMorten Tokle2018-09-131-0/+10
|\ \ \ \ \ \ \ \
| * | | | | | | | Validate new ssl configMorten Tokle2018-09-131-0/+10
|/ / / / / / / /
* | | | | | | | Merge pull request #6929 from vespa-engine/balder/replace-target-and-renameHenning Baldersheim2018-09-124-1/+67
|\ \ \ \ \ \ \ \
| * | | | | | | | Add test for proper setup and fix dirty retyping of ReferenceDataType target ...Henning Baldersheim2018-09-123-0/+66
| * | | | | | | | Enhance array detection to avoid detecting .[document]. as an array.Henning Baldersheim2018-09-121-1/+1
* | | | | | | | | Merge pull request #6912 from vespa-engine/havardpe/smart-buffer-in-vespalibHåvard Pettersen2018-09-126-0/+252
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | slightly smarter buffer with testHåvard Pettersen2018-09-116-0/+252
* | | | | | | | | | Merge pull request #6931 from vespa-engine/bjorncs/less-bouncycastleBjørn Christian Seime2018-09-122-3/+3
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Revert "Replace RSA with EC in unit test"Bjørn Christian Seime2018-09-121-2/+2
| * | | | | | | | | | Revert "Use BouncyCastle as provider for JKS keystore"Bjørn Christian Seime2018-09-121-1/+1
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #6926 from vespa-engine/jvenstad/miscLeandro Alves2018-09-121-3/+6
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | / / / / / | | |_|_|/ / / / / | |/| | | | | | |
| * | | | | | | | Differentiate between waiting for slot and current deploymentJon Marius Venstad2018-09-121-1/+4
| * | | | | | | | Add missing space in API test responseJon Marius Venstad2018-09-121-2/+2
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge pull request #6923 from vespa-engine/hmusum/always-use-dedicated-node-f...Jon Bratseth2018-09-123-8/+27
|\ \ \ \ \ \ \ \
| * | | | | | | | Create a dedicated node for logserver when on hosted (and only in CD for now)Harald Musum2018-09-123-8/+27
* | | | | | | | | Merge pull request #6908 from vespa-engine/bjorncs/ec-pem-supportBjørn Christian Seime2018-09-1223-1048/+46
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Use BouncyCastle as provider for JKS keystoreBjørn Christian Seime2018-09-111-1/+1
| * | | | | | | | | Remove most deprecated types from com.yahoo.vespa.athenz.tlsBjørn Christian Seime2018-09-1118-1034/+17
| * | | | | | | | | Replace RSA with EC in unit testBjørn Christian Seime2018-09-111-2/+2
| * | | | | | | | | Use KeyUtilsBjørn Christian Seime2018-09-111-7/+4
| * | | | | | | | | Support PEM serialization of EC private keysBjørn Christian Seime2018-09-112-4/+22
* | | | | | | | | | Merge pull request #6922 from vespa-engine/gjoranv/shade-pluginBjørn Christian Seime2018-09-121-18/+25
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Use shade plugin instead of assembly.gjoranv2018-09-121-18/+25