summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | 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
| * | | Make zone a constantBjørn Christian Seime2017-10-251-4/+5
| * | | Move code for generating PEM string to separate methodBjørn Christian Seime2017-10-251-20/+18
| * | | Mock retrieving TLS certificate from unit testBjørn Christian Seime2017-10-254-72/+174
* | | | Merge pull request #3863 from vespa-engine/toregge/use-document-bucket-to-not...Tor Brede Vekterli2017-10-2524-286/+301
|\ \ \ \
| * | | | Pass bucket space to PersistenceThread::getBucket().Tor Egge2017-10-243-11/+11
| * | | | Remove unused method declarations.Tor Egge2017-10-241-4/+0
| * | | | Use document::Bucket instead of document::BucketId as key forTor Egge2017-10-2417-191/+200
| * | | | Add default constuctor for document::Bucket since vespalib::hash_mapTor Egge2017-10-242-0/+7
| * | | | Use document::Bucket instead of document::BucketId to notify bucketTor Egge2017-10-248-89/+92
* | | | | Merge pull request #3877 from vespa-engine/freva/disable-log-forwardHarald Musum2017-10-251-0/+1
|\ \ \ \ \
| * | | | | Disable log forward in hosted vespaValerij Fredriksen2017-10-251-0/+1
* | | | | | Merge pull request #3876 from vespa-engine/mortent/move-identity-configgjoranv2017-10-253-16/+46
|\ \ \ \ \ \
| * | | | | | Move identity config to ContainerClusterMorten Tokle2017-10-253-16/+46
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #3875 from vespa-engine/bjorncs/exclude-slf4j-apiMorten Tokle2017-10-251-0/+12
|\ \ \ \ \ \
| * | | | | | Exclude slf4j-api from Athenz dependenciesBjørn Christian Seime2017-10-251-0/+12
| | |_|_|/ / | |/| | | |
* | | | | | Merge pull request #3868 from vespa-engine/bjorncs/disable-cert-validationMorten Tokle2017-10-251-4/+22
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Disable certifcate validation for service provider clientBjørn Christian Seime2017-10-241-4/+22
* | | | | | Merge pull request #3874 from vespa-engine/geirst/changes-to-hwinfo-cfg-requi...Henning Baldersheim2017-10-251-7/+7
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Changes to hwinfo config requires restart of proton.Geir Storli2017-10-251-7/+7
* | | | | | Merge pull request #3867 from vespa-engine/havardpe/use-new-api-in-irHåvard Pettersen2017-10-2511-110/+110
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | use new api in tensor function irHåvard Pettersen2017-10-2411-110/+110
* | | | | | Merge pull request #3872 from vespa-engine/bjorncs/catch-throwableBjørn Christian Seime2017-10-251-1/+1
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Catch all Throwable instancesBjørn Christian Seime2017-10-251-1/+1
|/ / / / /
* | | | | Merge pull request #3837 from vespa-engine/hakonhall/also-set-distributor-wan...Håkon Hallingstad2017-10-254-12/+251
|\ \ \ \ \