summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | Merge pull request #3906 from vespa-engine/bjorncs/correct-zts-urlBjørn Christian Seime2017-10-262-3/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix invalid ZTS url suffixBjørn Christian Seime2017-10-262-3/+3
|/ / / / / / / / /
* | | | | | | | | Merge pull request #3905 from vespa-engine/bjorncs/athenz-identity-provider-s...Morten Tokle2017-10-266-40/+88
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Pass hostname as query parameterBjørn Christian Seime2017-10-261-4/+14
| * | | | | | | | | Move identity document endpoint to separate servletBjørn Christian Seime2017-10-265-36/+74
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #3902 from vespa-engine/bjorncs/export-packageMorten Tokle2017-10-261-0/+8
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Export com.yahoo.vespa.hosted.provision.nodeBjørn Christian Seime2017-10-261-0/+8
|/ / / / / / / /
* | | | | | | | Merge pull request #3895 from vespa-engine/toregge/pass-bucket-space-to-getbu...Tor Brede Vekterli2017-10-268-26/+26
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Make document::BucketSpace a mandatory argument toTor Egge2017-10-268-26/+26
| |/ / / / / /
* | | | | | | Merge pull request #3899 from vespa-engine/bjorncs/athenz-migrationMartin Polden2017-10-261-2/+4
|\ \ \ \ \ \ \
| * | | | | | | Improve logging during tenant migration to AthenzBjørn Christian Seime2017-10-261-2/+4
| |/ / / / / /
* | | | | | | Merge pull request #3898 from vespa-engine/mortent/read-configserver-in-builderBjørn Christian Seime2017-10-263-11/+14
|\ \ \ \ \ \ \
| * | | | | | | Read configserver hostname while constructing identityMorten Tokle2017-10-263-11/+14
|/ / / / / / /
* | | | | | | Merge pull request #3888 from vespa-engine/hakonhall/provide-more-info-in-hos...Håkon Hallingstad2017-10-2614-25/+370
|\ \ \ \ \ \ \
| * | | | | | | Undo incompatible change to HostResource::getHostHåkon Hallingstad2017-10-263-10/+68
| * | | | | | | Avoid recursive toStringHåkon Hallingstad2017-10-252-4/+0
| * | | | | | | Avoid recursive hashCode and equalsHåkon Hallingstad2017-10-252-6/+4
| * | | | | | | Provide more info in host Orchestrator REST APIHåkon Hallingstad2017-10-2513-23/+316
* | | | | | | | Merge pull request #3894 from vespa-engine/geirst/adjust-hard-memory-limits-f...Henning Baldersheim2017-10-264-19/+34
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Adjust hard memory limits for flush strategy.Geir Storli2017-10-264-19/+34
* | | | | | | | Merge pull request #3893 from vespa-engine/mortent/use-identity-lbaddressMorten Tokle2017-10-261-3/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Use identity.loadbalanceraddressMorten Tokle2017-10-261-3/+2
|/ / / / / / / /
* | | | | | | | Merge pull request #3892 from vespa-engine/mortent/identity-include-cfgserverBjørn Christian Seime2017-10-261-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | fix testMorten Tokle2017-10-261-1/+1
* | | | | | | | | Merge pull request #3891 from vespa-engine/mortent/identity-include-cfgserverBjørn Christian Seime2017-10-263-24/+27
|\| | | | | | | | | |/ / / / / / / |/| | | | | | |
| * | | | | | | Add load balancer address to identity configMorten Tokle2017-10-262-0/+7
| * | | | | | | Refactor identity as config producerMorten Tokle2017-10-262-24/+20
* | | | | | | | Merge pull request #3890 from vespa-engine/balder/ignore-test-depending-on-vm...Arnstein Ressem2017-10-261-0/+5
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Temporary ignore test depending on sysctl setting vm.legacy_va_layout setting.Henning Baldersheim2017-10-261-0/+5
* | | | | | | | Merge pull request #3889 from vespa-engine/balder/routin-error-exposureHenning Baldersheim2017-10-262-12/+21
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Give more information on routing error.Henning Baldersheim2017-10-261-1/+1
| * | | | | | | Add newline for visual pleasure.Henning Baldersheim2017-10-251-0/+2
| * | | | | | | Expose underlying errors.Henning Baldersheim2017-10-251-11/+18
* | | | | | | | Merge pull request #3886 from vespa-engine/toregge/pass-bucket-space-to-getbu...Tor Brede Vekterli2017-10-2615-65/+92
|\ \ \ \ \ \ \ \
| * | | | | | | | Make document::BucketSpace a mandatory argument toTor Egge2017-10-2515-65/+92
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge pull request #3885 from vespa-engine/geirst/fix-race-condition-in-log-d...Henning Baldersheim2017-10-261-0/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | Avoid race conditions by taking updateLock when iterating file chunks.Geir Storli2017-10-251-0/+3
* | | | | | | | | Merge pull request #3884 from vespa-engine/havardpe/remove-old-reduce-map-app...Arne H Juul2017-10-2513-409/+44
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | remove old reduce/map/apply tensor APIHåvard Pettersen2017-10-2513-409/+44
* | | | | | | | | | Merge pull request #3887 from vespa-engine/bratseth/read-inside-lockJon Marius Venstad2017-10-256-41/+32
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | |
| * | | | | | | | | Always re-read application inside lockJon Bratseth2017-10-256-41/+32
|/ / / / / / / / /
* | | | | | | | | Merge pull request #3878 from vespa-engine/toregge/use-document-bucket-to-tra...Tor Brede Vekterli2017-10-2516-156/+141
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Pass document::Bucket to AbortBucketOperationsCommand::shouldAbort method.Tor Egge2017-10-256-48/+39
| * | | | | | | | Track rename of method to get bucket from storage message.Tor Egge2017-10-251-1/+1
| * | | | | | | | Use document::Bucket when mapping operations to disk.Tor Egge2017-10-252-18/+18
| * | | | | | | | Use document::Bucket as key for merge state tracking.Tor Egge2017-10-2511-89/+83
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge pull request #3879 from vespa-engine/bjorncs/improve-athenz-identity-pr...Bjørn Christian Seime2017-10-258-128/+246
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Don't use String as type for private keys and certificates in interfacesBjørn Christian Seime2017-10-258-45/+34
| * | | | | | | Don't use PemKeyStore from jdisc_http_serviceBjørn Christian Seime2017-10-251-13/+18
| * | | | | | | Keep code line length below limitBjørn Christian Seime2017-10-251-18/+41