summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Automatic commit of package [vespa] release [6.222.24-1].vespa-6.222.24-1by-screwdriver2018-03-154-1/+2
* 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
|\ \ \ \ \ \ \ \
| * | | | | | | | Do not return with exit code 1 if help option is usedHarald Musum2018-03-131-1/+7
* | | | | | | | | Merge pull request #5328 from vespa-engine/mpolden/zone-registry-cleanupMartin Polden2018-03-147-39/+23
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix unstable testMartin Polden2018-03-141-1/+5
| * | | | | | | | | Make casing consistentMartin Polden2018-03-143-3/+3
| * | | | | | | | | Remove unused methodMartin Polden2018-03-142-16/+8
| * | | | | | | | | Fix TODOsMartin Polden2018-03-146-19/+7
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #5326 from vespa-engine/mortent/controller-managed-zones-l...Morten Tokle2018-03-141-2/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Include only controller managed zones in uris and zonesMorten Tokle2018-03-141-2/+4
| |/ / / / / / / /
* | | | | | | | | Merge pull request #5327 from vespa-engine/hakonhall/also-map-in-sia-on-proxy...Valerij Fredriksen2018-03-141-1/+2
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | |
| * | | | | | | | Also map in sia on proxy hostHåkon Hallingstad2018-03-141-1/+2
|/ / / / / / / /
* | | | | | | | Merge pull request #5321 from vespa-engine/bjorncs/remove-opsdb-tenant-typeBjørn Christian Seime2018-03-1425-327/+34
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Remove unused methods in EntityServiceBjørn Christian Seime2018-03-132-22/+0
| * | | | | | | Remove unused field and simplify constructorBjørn Christian Seime2018-03-132-15/+9
| * | | | | | | Remove support for OpsDb tenantsBjørn Christian Seime2018-03-1319-168/+26
| * | | | | | | Remove api for migrating tenants to AthenzBjørn Christian Seime2018-03-136-123/+0
* | | | | | | | Merge pull request #5323 from vespa-engine/mpolden/expand-ipv6-loopbackMartin Polden2018-03-142-2/+2
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Expand IPv6 loopback address in filterMartin Polden2018-03-142-2/+2
|/ / / / / / /
* | | | | | | Merge pull request #5316 from vespa-engine/freva/share-configserver-certifica...Valerij Fredriksen2018-03-141-0/+4
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Share configserver certificate with proxyValerij Fredriksen2018-03-131-0/+4
* | | | | | | Merge pull request #5319 from vespa-engine/smorgrav/ifcfgHåkon Hallingstad2018-03-131-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Make public to be able to use IPAddress class in other packagestoby2018-03-131-1/+1
| |/ / / / / /
* | | | | | | Merge pull request #5320 from vespa-engine/vekterli/ensure-missing-replicas-h...Geir Storli2018-03-133-3/+42
|\ \ \ \ \ \ \
| * | | | | | | Use more appropriate node indices in testTor Brede Vekterli2018-03-131-3/+3
| * | | | | | | Missing replicas must be in a different checksum group than empty replicasTor Brede Vekterli2018-03-133-3/+42
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #5318 from vespa-engine/geirst/remove-unused-reporters-fro...Tor Brede Vekterli2018-03-1317-586/+6
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |