summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | Merge pull request #5343 from vespa-engine/hmusum/lower-log-levelHenning Baldersheim2018-03-151-4/+3
|\ \ \ \ \ \
| * | | | | | Lower log level for common case where config server does not have fileHarald Musum2018-03-151-4/+3
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #5344 from vespa-engine/vekterli/reduce-default-distributo...Geir Storli2018-03-151-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Reduce merge busy wait time from 30 to 10 secondsTor Brede Vekterli2018-03-151-1/+1
| |/ / / /
* | | | | Merge pull request #5341 from vespa-engine/mpolden/remove-deleted-api-from-wh...Bjørn Christian Seime2018-03-152-5/+3
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Remove non-existent API from whitelistMartin Polden2018-03-152-5/+3
| | |_|/ | |/| |
* | | | Merge pull request #5339 from vespa-engine/mpolden/handle-forbiddenMartin Polden2018-03-153-11/+39
|\ \ \ \ | |_|/ / |/| | |
| * | | Handle forbidden response from node-repoMartin Polden2018-03-153-11/+39
| |/ /
* | | Merge pull request #5340 from vespa-engine/hakonhall/export-network-task-utilValerij Fredriksen2018-03-151-0/+5
|\ \ \
| * | | Export network task utilHåkon Hallingstad2018-03-151-0/+5
| |/ /
* | | Merge pull request #5285 from vespa-engine/arnej/add-gzip-accesslogsJon Bratseth2018-03-156-9/+61
|\ \ \ | |/ / |/| |
| * | ensure gzip of access logs for hosted vespa onlyArne Juul2018-03-123-4/+19
| * | hack in gzip of access logsArne Juul2018-03-114-6/+43
* | | Merge pull request #5334 from vespa-engine/mpolden/remove-deprecated-apiMartin Polden2018-03-1512-98/+29
|\ \ \
| * | | Add / fix @authorMartin Polden2018-03-148-3/+19
| * | | Add @JsonIgnoreProperties where missingMartin Polden2018-03-144-0/+8
| * | | Remove deprecated suspend APIMartin Polden2018-03-144-95/+2
* | | | Merge pull request #5336 from vespa-engine/vekterli/immediately-reply-to-pend...Geir Storli2018-03-158-87/+151
|\ \ \ \
| * | | | Immediately send GetNodeState replies when leaving recovery modeTor Brede Vekterli2018-03-145-4/+43
| * | | | Expose StateManager method to immediately send GetNodeState repliesTor Brede Vekterli2018-03-145-11/+50
| * | | | Clean up of StateManager code, no logic changesTor Brede Vekterli2018-03-141-73/+59
* | | | | Merge pull request #5332 from vespa-engine/havardpe/clean-up-tensor-function-...Arne H Juul2018-03-1518-369/+20
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | use 'Super' when forwarding calls to visit_selfHåvard Pettersen2018-03-146-9/+18
| * | | | no need to include templated visit rulesHåvard Pettersen2018-03-141-1/+0
| * | | | always use actual class nameHåvard Pettersen2018-03-143-9/+2
| * | | | remove DumpTarget and dump_treeHåvard Pettersen2018-03-1417-350/+0
* | | | | Merge pull request #5335 from vespa-engine/geirst/reapply-finalize-cluster-st...Tor Egge2018-03-144-3/+84
|\ \ \ \ \
| * | | | | Finalize ClusterStateBundle to return derived cluster state if bucket space i...Geir Storli2018-03-144-3/+84
* | | | | | Merge pull request #5331 from vespa-engine/toregge/matchengine-should-be-up-i...Geir Storli2018-03-146-9/+25
|\ \ \ \ \ \
| * | | | | | Remove dead code.Tor Egge2018-03-141-1/+0
| * | | | | | Match engine should be up if cluster state for any bucketspace saysTor Egge2018-03-146-9/+26
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #5333 from vespa-engine/mpolden/fix-filter-content-typeMartin Polden2018-03-145-43/+47
|\ \ \ \ \ \
| * | | | | | Set correct Content-Type in responses from filterMartin Polden2018-03-145-43/+47
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #5330 from vespa-engine/bjorncs/client-certBjørn Christian Seime2018-03-143-6/+3
|\ \ \ \ \ \
| * | | | | | Fetch the client cert chain attribute directly from underlying servlet requestBjørn Christian Seime2018-03-141-1/+1
| * | | | | | Remove unused fieldBjørn Christian Seime2018-03-142-5/+2
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #5329 from vespa-engine/jvenstad/fix-prompt-inside-containersHåkon Hallingstad2018-03-141-1/+1
|\ \ \ \ \ \
| * | | | | | Escaping had escaped, and green was notJon Marius Venstad2018-03-141-1/+1
* | | | | | | Merge pull request #5324 from vespa-engine/jvenstad/guard-against-non-root-us...Jon Marius Venstad2018-03-141-3/+7
|\ \ \ \ \ \ \
| * | | | | | | Replace with try-catch, and with more commentaryJon Marius Venstad2018-03-141-3/+7
* | | | | | | | Merge pull request #5297 from vespa-engine/freva/simplify-key-load/storeBjørn Christian Seime2018-03-145-53/+27
|\ \ \ \ \ \ \ \
| * | | | | | | | Simplify key load/store in node-adminValerij Fredriksen2018-03-135-53/+27
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge pull request #5284 from vespa-engine/hmusum/do-not-set-health-status-up...Jon Bratseth2018-03-145-111/+150
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | Ignore non-working test (needs fixing MockCurator.MockLock to work)Harald Musum2018-03-141-0/+3
| * | | | | | | Revert "Implement isAcquiredInThisProcess, else it will always return false"Harald Musum2018-03-141-6/+0
| * | | | | | | Handle failing app redeployment at statup and do not set health status to 'up'Harald Musum2018-03-115-111/+147
| * | | | | | | Implement isAcquiredInThisProcess, else it will always return falseHarald Musum2018-03-111-0/+6
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge pull request #5325 from vespa-engine/mpolden/allow-host-accessMartin Polden2018-03-142-2/+26
|\ \ \ \ \ \ \
| * | | | | | | Allow host principal to access all resourcesMartin Polden2018-03-142-2/+26
* | | | | | | | Merge pull request #5304 from vespa-engine/hmusum/exit-code-0-if-help-option-...Valerij Fredriksen2018-03-141-1/+7
|\ \ \ \ \ \ \ \