summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | Merge pull request #4452 from vespa-engine/revert-4451-revert-4266-revert-426...Jon Bratseth2017-12-1518-122/+212
|\ \ \ \ \ \ \
| * | | | | | | Revert "Revert "Revert "Revert "Bratseth/select 1 host by index""""Jon Bratseth2017-12-1518-122/+212
|/ / / / / / /
* | | | | | | Merge pull request #4451 from vespa-engine/revert-4266-revert-4265-revert-424...Henning Baldersheim2017-12-1418-212/+122
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Revert "Revert "Revert "Bratseth/select 1 host by index"""Henning Baldersheim2017-12-1418-212/+122
|/ / / / / /
* | | | | | Merge pull request #4266 from vespa-engine/revert-4265-revert-4241-bratseth/s...Jon Bratseth2017-12-1418-122/+212
|\ \ \ \ \ \
| * \ \ \ \ \ Merge with masterJon Bratseth2017-12-14878-12677/+15329
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| * | | | | | Fall back to sort by hostname if a host has no membershipJon Bratseth2017-11-2413-38/+45
| * | | | | | Revert "Revert "Bratseth/select 1 host by index""Jon Bratseth2017-11-246-80/+157
* | | | | | | Merge pull request #4447 from vespa-engine/arnej/add-metrics-to-handlers-2Harald Musum2017-12-1412-16/+38
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | add jdisc Metric wiringArne Juul2017-12-1412-16/+38
|/ / / / / /
* | | | | | Merge pull request #4441 from vespa-engine/arnej/add-dedup-in-dispatchArne H Juul2017-12-143-11/+35
|\ \ \ \ \ \
| * | | | | | update after review feedbackArne Juul2017-12-141-6/+3
| * | | | | | do de-duplication on GlobalID in dispatchArne Juul2017-12-133-9/+36
* | | | | | | Merge pull request #4444 from vespa-engine/hmusum/async-filedistributionHenning Baldersheim2017-12-147-22/+22
|\ \ \ \ \ \ \
| * | | | | | | Do async file distribution (when preparing application) when file distributor...Harald Musum2017-12-147-22/+22
|/ / / / / / /
* | | | | | | Merge pull request #4421 from vespa-engine/jvenstad/zone-cleanup-3Jon Marius Venstad2017-12-1411-105/+119
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Optional<Duration> againJon Marius Venstad2017-12-147-12/+9
| * | | | | | Correct deprecation messageJon Marius Venstad2017-12-121-1/+1
| * | | | | | Need new classes for hosted compilationJon Marius Venstad2017-12-1261-192/+525
| |\ \ \ \ \ \
| * | | | | | | Added new secure config server uri stuffJon Marius Venstad2017-12-122-5/+14
| * | | | | | | Reintroduced Optional for default region and made mock consistentJon Marius Venstad2017-12-128-10/+30
| * | | | | | | DeploymentId beautificationJon Marius Venstad2017-12-123-33/+31
| * | | | | | | Fix mock, move kibana stuff to hosted and add some docJon Marius Venstad2017-12-123-27/+33
| * | | | | | | More simplificationsJon Marius Venstad2017-12-114-14/+10
| * | | | | | | Removed two pointless Optional<> and replaced more (Env, Reg) with ZoneIdJon Marius Venstad2017-12-115-27/+17
| * | | | | | | Replaced ZoneId getZone(ZoneId zoneId) with hasZone(ZoneId zoneId)Jon Marius Venstad2017-12-118-24/+22
* | | | | | | | Merge pull request #4440 from vespa-engine/mpolden/remove-all-instances-on-de...Jon Bratseth2017-12-142-24/+53
|\ \ \ \ \ \ \ \
| * | | | | | | | Delete all instances on application deleteMartin Polden2017-12-142-24/+53
* | | | | | | | | Merge pull request #4443 from vespa-engine/balder/avoid-exception-during-cons...Henning Baldersheim2017-12-132-37/+37
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Utilize using clause.Henning Baldersheim2017-12-131-18/+20
| * | | | | | | | | Remove redundant cast.Henning Baldersheim2017-12-131-12/+9
| * | | | | | | | | Exception to construction should not create an empty entry in the map.Henning Baldersheim2017-12-131-7/+8
* | | | | | | | | | Merge pull request #4442 from vespa-engine/hmusum/update-download-status-when...Henning Baldersheim2017-12-134-22/+34
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Update download status after each part receivedHarald Musum2017-12-134-22/+34
|/ / / / / / / / /
* | | | | | | | | Merge pull request #4436 from vespa-engine/hakonhall/set-connection-timeouts-...Harald Musum2017-12-131-0/+12
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Set connection timeouts on config server clientHåkon Hallingstad2017-12-131-0/+12
* | | | | | | | | | Merge pull request #4439 from vespa-engine/geirst/produce-bucketspaces-config...Tor Brede Vekterli2017-12-137-117/+120
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add switch to enable multiple bucket spaces in content layer and content nodes.Geir Storli2017-12-132-0/+6
| * | | | | | | | | | Produce bucketspaces config for entire content cluster.Geir Storli2017-12-134-42/+39
| * | | | | | | | | | Add common representation of doc type used for testing.Geir Storli2017-12-134-76/+76
* | | | | | | | | | | Merge pull request #4433 from vespa-engine/mpolden/expose-assigned-rotation-i...Jon Bratseth2017-12-134-5/+12
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / |/| | | | | | | | | |
| * | | | | | | | | | Expose assigned rotation in application APIMartin Polden2017-12-134-5/+12
| |/ / / / / / / / /
* | | | | | | | | | Merge pull request #4434 from vespa-engine/hmusum/set-deploy-timeout-in-one-p...Jon Bratseth2017-12-139-8/+41
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
| * | | | | | | | | Set timeout for internal deployment in one placeHarald Musum2017-12-139-8/+41
| |/ / / / / / / /
* | | | | | | | | Merge pull request #4437 from vespa-engine/bjorncs/hostname-validationMorten Tokle2017-12-131-1/+1
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | Temporarily disable hostname validationBjørn Christian Seime2017-12-131-1/+1
|/ / / / / / / /
* | | | | | | | Merge pull request #4431 from vespa-engine/mpolden/retire-containers-earlyJon Bratseth2017-12-138-167/+330
|\ \ \ \ \ \ \ \
| * | | | | | | | Recycle failed container nodes after 1 hourMartin Polden2017-12-133-156/+313
| * | | | | | | | CleanupMartin Polden2017-12-136-11/+17
* | | | | | | | | Merge pull request #4432 from vespa-engine/bjorncs/athenz-trust-storeMorten Tokle2017-12-131-0/+45
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |