summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Correct the signature.Henning Baldersheim2017-11-071-1/+1
* Update receiveFile to new signature.Henning Baldersheim2017-11-073-5/+12
* Add serveFile interface.Henning Baldersheim2017-11-072-0/+59
* Add serveFile interface.Henning Baldersheim2017-11-077-14/+66
* Merge pull request #4022 from vespa-engine/hmusum/filereferences-downloadHenning Baldersheim2017-11-0713-119/+585
|\
| * Fix test to not read from queueHarald Musum2017-11-073-6/+9
| * Add a queue for downloadsHarald Musum2017-11-075-41/+106
| * Synchronize access when making copy in the right placeHarald Musum2017-11-072-3/+3
| * Implement downloading of file references, not functional yetHarald Musum2017-11-0712-120/+518
* | Merge pull request #4033 from vespa-engine/revert-4024-geirst/commit-attribut...Arnstein Ressem2017-11-072-77/+16
|\ \
| * | Revert "Geirst/commit attributes once when handling delete bucket operations"Arnstein Ressem2017-11-072-77/+16
|/ /
* | Merge pull request #4030 from vespa-engine/jvenstad/temporary-unit-test-fixMartin Polden2017-11-072-1/+6
|\ \
| * | Fixed conflictJon Marius Venstad2017-11-072-1/+6
* | | Merge pull request #4031 from vespa-engine/bjorncs/fix-x509-pem-parsingBjørn Christian Seime2017-11-071-3/+16
|\ \ \
| * | | Handle X509CertificateHolder instances when parsing certificate PEMBjørn Christian Seime2017-11-071-3/+16
* | | | Merge pull request #4027 from vespa-engine/mpolden/dev-systemHarald Musum2017-11-071-1/+5
|\ \ \ \
| * | | | Add dev systemMartin Polden2017-11-071-1/+5
| | |/ / | |/| |
* | | | Merge pull request #4029 from vespa-engine/havardpe/clean-up-tensor-engine-apiArne H Juul2017-11-0756-469/+378
|\ \ \ \ | |/ / / |/| | |
| * | | clean up tensor engine APIHåvard Pettersen2017-11-0756-469/+378
|/ / /
* | | Merge pull request #4009 from vespa-engine/freva/restart-on-flavor-changeValerij Fredriksen2017-11-0713-49/+135
|\ \ \ | |/ / |/| |
| * | flavor -> resourcesValerij Fredriksen2017-11-073-9/+9
| * | Restart container if different wanted and current ContainerResourcesValerij Fredriksen2017-11-032-0/+48
| * | Pass ContainerResources from DockerOperationsValerij Fredriksen2017-11-034-17/+8
| * | Take in ContainerResources in createContainerCommand()Valerij Fredriksen2017-11-035-31/+26
| * | Add ContainerResources to ContainerValerij Fredriksen2017-11-033-1/+53
* | | Merge pull request #4025 from vespa-engine/bjorncs/athenz-identity-provider-c...Bjørn Christian Seime2017-11-078-32/+32
|\ \ \
| * | | Add TODOBjørn Christian Seime2017-11-071-0/+1
| * | | Inline some boolean arguments that are always trueBjørn Christian Seime2017-11-073-10/+6
| * | | Build uri path using resolve() instead of string concatsBjørn Christian Seime2017-11-071-5/+8
| * | | Log failure of updating credentials as warningBjørn Christian Seime2017-11-071-1/+1
| * | | Rename parameter configServerHostname -> loadBalancerNameBjørn Christian Seime2017-11-071-4/+4
| * | | Rename ServiceProviderApi -> IdentityDocumentServiceBjørn Christian Seime2017-11-074-13/+13
* | | | Merge pull request #4024 from vespa-engine/geirst/commit-attributes-once-when...Geir Storli2017-11-072-16/+77
|\ \ \ \ | |/ / / |/| | |
| * | | Only commit attributes once when handling a batch remove in attribute writer.Geir Storli2017-11-071-4/+41
| * | | Remove unused code.Geir Storli2017-11-071-6/+0
| * | | Add test for batch remove on attribute writer.Geir Storli2017-11-071-6/+36
* | | | Merge pull request #4020 from vespa-engine/bjorncs/instance-refresh-requestBjørn Christian Seime2017-11-0713-98/+629
|\ \ \ \
| * | | | Take ManualClock as constructor argumentBjørn Christian Seime2017-11-061-13/+16
| * | | | Add token refresh to AthenzIdentityProvider implementationBjørn Christian Seime2017-11-069-54/+564
| * | | | Add setInstant(Instant) to ManualClockBjørn Christian Seime2017-11-061-0/+4
| * | | | Add deserializer for X509 certificateBjørn Christian Seime2017-11-063-5/+24
| * | | | Remove unused fieldsBjørn Christian Seime2017-11-062-28/+3
| * | | | Cleanup URI generating code for ServiceProviderApiBjørn Christian Seime2017-11-061-11/+23
| * | | | Enable retry for mutating HTTP methods in AthenzServiceBjørn Christian Seime2017-11-061-3/+9
| * | | | Model ztsEndpoint as URIBjørn Christian Seime2017-11-063-10/+12
| | |_|/ | |/| |
* | | | Merge pull request #4012 from vespa-engine/balder/omit-sessionid-from-cache-keyJon Bratseth2017-11-076-29/+73
|\ \ \ \ | |_|/ / |/| | |
| * | | Be resilient on the length too.Henning Baldersheim2017-11-072-3/+4
| * | | Make the tests resilient to order of execution as the assigned uniqueId will ...Henning Baldersheim2017-11-072-12/+28
| * | | The queryflags count as part of the cache key.Henning Baldersheim2017-11-062-2/+2
| * | | 1 - Ignores the session key when creating the cache key.Henning Baldersheim2017-11-064-17/+44