summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #3990 from vespa-engine/bjorncs/fixBjørn Christian Seime2017-11-022-7/+5
|\
| * Work around akward semantics with TemporalAmount/DurationBjørn Christian Seime2017-11-022-7/+5
|/
* Merge pull request #3919 from vespa-engine/bratseth/OWNERS-cleanupKim Omar Johansen2017-11-025-5/+0
|\
| * Remove tmartins and empty linesJon Bratseth2017-10-275-5/+0
* | Merge pull request #3978 from vespa-engine/bjorncs/reduce-log-spamgjoranv2017-11-022-68/+105
|\ \
| * | Cleanup MetricUpdaterBjørn Christian Seime2017-11-022-70/+105
| * | Don't log exception if Linux specific file does not existBjørn Christian Seime2017-11-021-0/+2
* | | Merge pull request #3984 from vespa-engine/vekterli/add-reserved-document-typ...Jon Bratseth2017-11-024-0/+123
|\ \ \
| * | | Add reserved name validation for document type namesTor Brede Vekterli2017-11-024-0/+123
* | | | Merge pull request #3977 from vespa-engine/mortent/identity-provider-read-secretBjørn Christian Seime2017-11-026-39/+126
|\ \ \ \
| * | | | Read key from secretstore, refactor configMorten Tokle2017-11-026-39/+126
* | | | | Merge pull request #3982 from vespa-engine/toregge/rename-managed-bucket-spac...Geir Storli2017-11-0216-78/+78
|\ \ \ \ \
| * | | | | Rename ManagedBucketSpace to DistributorBucketSpace.Tor Egge2017-11-0216-78/+78
* | | | | | Merge pull request #3980 from vespa-engine/geirst/add-content-bucket-space-repoTor Brede Vekterli2017-11-0210-13/+100
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Change to return a reference to a bucket space to indicate that it should alw...Geir Storli2017-11-024-5/+5
| * | | | | Use nullptr instead of literal 0.Geir Storli2017-11-022-3/+3
| * | | | | Add repo for all bucket spaces (with associated bucket databases) on a conten...Geir Storli2017-11-0210-12/+99
* | | | | | Merge pull request #3981 from vespa-engine/bratseth/add-importJon Bratseth2017-11-021-0/+1
|\ \ \ \ \ \
| * | | | | | Add importJon Bratseth2017-11-021-0/+1
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #3972 from vespa-engine/hmusum/remove-deprecated-methodJon Bratseth2017-11-021-13/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Remove deprecated, unused method and default implementation from interfaceHarald Musum2017-11-021-13/+2
* | | | | | Merge pull request #3968 from vespa-engine/bratseth/upgrade-to-latest-goodJon Bratseth2017-11-0214-149/+286
|\ \ \ \ \ \
| * | | | | | Rename methodJon Bratseth2017-11-021-3/+3
| * | | | | | Newer downgrade a production deploymentJon Bratseth2017-11-024-19/+72
| * | | | | | Always try to upgrade to the latest good versionJon Bratseth2017-11-019-130/+214
| * | | | | | Nonfunctional changes onlyJon Bratseth2017-10-312-2/+2
* | | | | | | Merge pull request #3973 from vespa-engine/toregge/use-document-bucket-in-pri...Geir Storli2017-11-0219-106/+115
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Fix BucketAndNodes constructor declarations.Tor Egge2017-11-021-4/+4
| * | | | | | Adjust MaintenancePriorityGenerator and MaintenanceOperationGenerator toTor Egge2017-11-0211-48/+55
| * | | | | | Use document::Bucket in PrioritizedBucket.Tor Egge2017-11-0210-56/+58
* | | | | | | Merge pull request #3976 from vespa-engine/geirst/order-sources-in-storage-cm...Geir Storli2017-11-0225-146/+146
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Order sources in CMakeLists.txt files.Geir Storli2017-11-0225-146/+146
* | | | | | | Merge pull request #3975 from vespa-engine/mpolden/include-controller-configMartin Polden2017-11-021-0/+3
|\ \ \ \ \ \ \
| * | | | | | | Include controller config in configserver-appMartin Polden2017-11-021-0/+3
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge pull request #3940 from vespa-engine/hakonhall/use-host-tag-instead-of-...Bjørn Christian Seime2017-11-021-2/+2
|\ \ \ \ \ \ \
| * | | | | | | Use host tag instead of hostnameHåkon Hallingstad2017-10-301-2/+2
* | | | | | | | Merge pull request #3967 from vespa-engine/bjorncs/travisHenning Baldersheim2017-11-021-0/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Tune malloc to reduce chance of OoMBjørn Christian Seime2017-11-011-0/+1
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge pull request #3964 from vespa-engine/bjorncs/athenz-user-domaingjoranv2017-11-024-8/+9
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Athenz now uses "user" as principal domain and "home" as personal domainBjørn Christian Seime2017-11-014-8/+9
* | | | | | | | Merge pull request #3971 from vespa-engine/revert-3957-revert-3943-toregge/us...Håkon Hallingstad2017-11-0228-691/+276
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | Revert "Revert "Toregge/use standard locks in fastos""Arnstein Ressem2017-11-0228-691/+276
* | | | | | | | Merge pull request #3965 from vespa-engine/havardpe/unify-conformance-test-fo...Lester Solbakken2017-11-027-468/+264
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | unify conformance test format, refactor code and update specHåvard Pettersen2017-11-017-468/+264
* | | | | | | | Merge pull request #3966 from vespa-engine/hakonhall/avoid-changing-api-befor...Håkon Hallingstad2017-11-022-8/+15
|\ \ \ \ \ \ \ \
| * | | | | | | | Avoid changing API before all clients handle itHåkon Hallingstad2017-11-012-8/+15
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge pull request #3962 from vespa-engine/toregge/use-document-bucket-as-pen...Geir Storli2017-11-0210-42/+40
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Pass document::Bucket to Distributor::recheckBucketInfo.Tor Egge2017-11-019-18/+16
| * | | | | | | Use document::Bucket as pending message tracker key.Tor Egge2017-11-013-25/+25
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge pull request #3963 from vespa-engine/jvenstad/correct-platform-issue-fi...Jon Marius Venstad2017-11-023-38/+76
|\ \ \ \ \ \ \