summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #3401 from vespa-engine/bjorncs/athenzMorten Tokle2017-09-136-41/+4
|\ | | | | Remove ZMS/Athens client without principal
| * Remove ZMS/Athens client without principalBjørn Christian Seime2017-09-136-41/+4
| |
* | Merge pull request #3399 from vespa-engine/mpolden/maintainer-catch-throwableJon Bratseth2017-09-131-2/+2
|\ \ | |/ |/| Catch Throwable in maintainer
| * Catch Throwable in maintainerMartin Polden2017-09-131-2/+2
|/
* Merge pull request #3397 from vespa-engine/hmusum/handle-step-not-found-from-jobMartin Polden2017-09-121-1/+1
|\ | | | | Handle case where step cannot be found
| * Handle case where step cannot be foundHarald Musum2017-09-121-1/+1
| | | | | | | | * Avoid doing get() unconditionally on an optional
* | Merge pull request #3396 from vespa-engine/revert-3393-bjorncs/athenzArnstein Ressem2017-09-126-4/+41
|\ \ | |/ |/| Revert "Remove ZMS/Athens client without principal"
| * Revert "Remove ZMS/Athens client without principal"Arnstein Ressem2017-09-126-4/+41
|/
* Merge pull request #3391 from vespa-engine/smorgrav/fix_bcp_apiTorbjørn Smørgrav2017-09-128-34/+91
|\ | | | | Only set override for the canonical service endpoint
| * Spelling of canonicaltoby2017-09-121-7/+7
| |
| * Be consistent on how to handle errorstoby2017-09-111-3/+3
| |
| * Only set override for the global service endpointtoby2017-09-118-34/+91
| |
* | Merge pull request #3390 from ↵Geir Storli2017-09-1226-333/+445
|\ \ | | | | | | | | | | | | vespa-engine/geirst/fix-bitvector-search-cache-for-imported-attributes Geirst/fix bitvector search cache for imported attributes
| * | Fix indent.Geir Storli2017-09-121-275/+275
| | |
| * | Add parentheses for clarity.Geir Storli2017-09-121-2/+2
| | |
| * | Keep a document meta store read guard together with bitvector posting list ↵Geir Storli2017-09-1121-18/+87
| | | | | | | | | | | | | | | | | | in search cache for imported attributes. This is to ensure that no lids that are cached in the bitvector are re-used until the guard is released.
| * | Make commit() on VisibilityHandler always call forceCommit() on underlying ↵Geir Storli2017-09-113-15/+37
| | | | | | | | | | | | | | | | | | feed view (also with no feed operations since last time). This ensures that we reliably can clear the search caches of imported attribute vectors according to the visibility delay interval.
| * | Move read access part of IDocumentMetaStoreContext to searchlib.Geir Storli2017-09-113-26/+47
| | |
* | | Merge pull request #3385 from ↵Geir Storli2017-09-129-37/+22
|\ \ \ | | | | | | | | | | | | | | | | vespa-engine/toregge/hold-gid-mapper-to-avoid-premature-referenced-lid-reuse Keep a gid to lid mapper live during the lifetime of an imported attr…
| * | | remove unused mapGidToLid() method from gid to lid mapper. ReferenceTor Egge2017-09-115-35/+7
| | | | | | | | | | | | | | | | | | | | attribute uses foreach() method on gid to lid mapper to bootstrap internal mapping and receives notifyReferenced*() method calls to keep it updated.
| * | | Keep a gid to lid mapper live during the lifetime of an imported attributeTor Egge2017-09-114-2/+15
| | | | | | | | | | | | | | | | read guard, to avoid premature reuse of referenced lid.
* | | | Merge pull request #3393 from vespa-engine/bjorncs/athenzMorten Tokle2017-09-126-41/+4
|\ \ \ \ | | | | | | | | | | Remove ZMS/Athens client without principal
| * | | | Remove ZMS/Athens client without principalBjørn Christian Seime2017-09-126-41/+4
| | | | |
* | | | | Merge pull request #3383 from vespa-engine/aressem/delete-the-rpmbuild-branchJon Marius Venstad2017-09-121-1/+1
|\ \ \ \ \ | |/ / / / |/| | | | Actually delete the branch.
| * | | | Actually delete the branch.Arnstein Ressem2017-09-111-1/+1
| | | | |
* | | | | Merge pull request #3389 from ↵hakonhall2017-09-1215-98/+209
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | vespa-engine/hakon/add-component-managing-the-supermodel Add component managing the SuperModel
| * | | | | Add component managing the SuperModelHåkon Hallingstad2017-09-1115-98/+209
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is the prerequisite step for having the Orchestrator depend on the SuperModel component, getting notified via SuperModelListener about newly activated or removed applications. The Orchestrator will then register for Slobrok as necessary, and also update its data structures of the model.
* | | | | Merge pull request #3392 from vespa-engine/hmusum/avoid-log-noiseJon Bratseth2017-09-111-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Make sure description is not empty to avois spamming log
| * | | | | Make sure description is not empty to avois spamming logHarald Musum2017-09-111-1/+1
| | |_|_|/ | |/| | |
* | | | | Merge pull request #3387 from vespa-engine/gjoranv/exclude-asmJon Bratseth2017-09-111-0/+6
|\ \ \ \ \ | |/ / / / |/| | | | Exclude org.ow2.asm:asm from provided classpath.
| * | | | Exclude org.ow2.asm:asm from provided classpath.gjoranv2017-09-111-0/+6
|/ / / / | | | | | | | | | | | | - Test classpath already contains org.ow2.asm:asm-debug-all.
* | | | Merge pull request #3386 from vespa-engine/revert-3384-gjoranv/exclude-findbugsgjoranv2017-09-111-22/+0
|\ \ \ \ | | | | | | | | | | Revert "Exclude findbugs artifacts from provided classpath."
| * | | | Revert "Exclude findbugs artifacts from provided classpath."gjoranv2017-09-111-22/+0
|/ / / /
* | | | Merge pull request #3384 from vespa-engine/gjoranv/exclude-findbugsgjoranv2017-09-111-0/+22
|\ \ \ \ | |_|/ / |/| | | Exclude findbugs artifacts from provided classpath.
| * | | Exclude findbugs artifacts from provided classpath.gjoranv2017-09-111-0/+22
|/ / / | | | | | | | | | | | | | | | | | | - com.google.code.findbugs:annotations:jar:1.3.9 - com.google.code.findbugs:jsr305:jar:1.3.9 * There should be no reason to expose these in test scope, they only contain annotations.
* | | Merge pull request #3380 from vespa-engine/arnej/cleanup-hostname-2Jon Bratseth2017-09-112-6/+5
|\ \ \ | | | | | | | | use Defaults.vespaHostname()
| * | | use Defaults.vespaHostname()Arne Juul2017-09-112-6/+5
| | |/ | |/| | | | | | | * also fix test to be consistent, it would fail on laptop with Wi-Fi
* | | Merge pull request #3379 from vespa-engine/mpolden/idempotent-deactivationHarald Musum2017-09-113-16/+35
|\ \ \ | | | | | | | | Make deactivate idempotent
| * | | Make deactivate idempotentMartin Polden2017-09-113-16/+35
| | |/ | |/|
* | | Merge pull request #3381 from vespa-engine/gjoranv/exclude-HdrHistogramgjoranv2017-09-114-1/+15
|\ \ \ | | | | | | | | Expose HdrHistogram in test scope instead of provided for users.
| * | | Expose HdrHistogram in test scope instead of provided for users.gjoranv2017-09-114-1/+15
|/ / / | | | | | | | | | | | | | | | - It's not provided runtime, but we should consider doing so, as simplemetric:UntypedMetric exposes a public method that returns an org.HdrHistogram.DoubleHistogram.
* | | Merge pull request #3374 from vespa-engine/toregge/fedora-26-portArnstein Ressem2017-09-112-12/+65
|\ \ \ | | | | | | | | Limited port to Fedora 25 and Fedora 26.
| * | | A C++ compiler and libatomic is needed to build on Fedora.Tor Egge2017-09-091-0/+4
| | | |
| * | | Limited port to Fedora 25 and Fedora 26.Tor Egge2017-09-082-12/+61
| | | |
* | | | Merge pull request #3375 from vespa-engine/freva/remove-hardware-failure-typeValerij Fredriksen2017-09-115-32/+1
|\ \ \ \ | | | | | | | | | | Remove hardwareFailureType
| * | | | Remove hardwareFailureTypeValerij Fredriksen2017-09-085-32/+1
| | | | |
* | | | | Merge pull request #3378 from vespa-engine/arnej/cleanup-hostnameJon Bratseth2017-09-113-12/+5
|\ \ \ \ \ | |_|_|_|/ |/| | | | simplify single node case
| * | | | simplify single node caseArne Juul2017-09-113-12/+5
|/ / / /
* | | | Merge pull request #3376 from vespa-engine/balder/bring-documenttype-alongJon Bratseth2017-09-113-5/+50
|\ \ \ \ | | | | | | | | | | Balder/bring documenttype along
| * | | | Add test that doctype is propagated correctly to where it is needed.Henning Baldersheim2017-09-081-3/+36
| | | | |