summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Automatic commit of package [vespa] release [6.244.127-1].vespa-6.244.127-1by-screwdriver2018-06-044-1/+2
* Merge pull request #6066 from vespa-engine/jvenstad/revert-athenz-thingsJon Marius Venstad2018-06-0321-252/+74
|\
| * Revert "Remove parent hostname from identity document"Jon Marius Venstad2018-06-032-2/+10
| * Revert "Prepare for inlining of 'IdentityDocument' into 'SignedIdentityDocume...Jon Marius Venstad2018-06-0311-108/+22
| * Revert "Add identity type to unique instance id and signed identity document"Jon Marius Venstad2018-06-0312-135/+28
| * Revert "Use identity type to generate identity document"Jon Marius Venstad2018-06-035-18/+26
| * Revert "Allow deserialization of java.time.Instant"Jon Marius Venstad2018-06-031-2/+1
|/
* Merge pull request #6063 from vespa-engine/balder/allow-dot-nested-fieldnames...Henning Baldersheim2018-06-032-18/+39
|\
| * Add testing of recursively nested names.Henning Baldersheim2018-06-031-0/+5
| * Allow nested fieldnames using '.' in yql.Henning Baldersheim2018-06-032-18/+34
* | Restore code to previous functionality, except for intended change (#6064)Jon Marius Venstad2018-06-031-2/+2
|/
* Merge pull request #6001 from vespa-engine/bratseth/always-apply-config-on-in...Jon Bratseth2018-06-0295-402/+715
|\
| * Test internalRedepoy persistenceJon Bratseth2018-06-016-6/+8
| * Remove printlnJon Bratseth2018-06-011-1/+0
| * Test no config when restart on redeployJon Bratseth2018-06-017-12/+46
| * Test internalRedeploy from ApplicationMetaData -> ConfigResponseJon Bratseth2018-06-015-31/+53
| * Test internalRedeploy propagation in config responsesJon Bratseth2018-06-0114-39/+52
| * Internal redeploy Depoyer.deployFromLocalActive -> ApplicationMetaDataJon Bratseth2018-06-012-2/+9
| * Correct JavaDocJon Bratseth2018-06-011-2/+0
| * Merge with masterJon Bratseth2018-06-01192-4255/+7280
| |\
| * | Separate internal redeploys from application package changesJon Bratseth2018-06-0175-314/+543
| * | Run reconfigurer thread even when restartOnRedeploy is trueJon Bratseth2018-05-309-53/+61
* | | Merge pull request #6062 from vespa-engine/balder/add-same-element-with-recur...Henning Baldersheim2018-06-024-9/+67
|\ \ \
| * | | Do not validate on cloneHenning Baldersheim2018-06-012-2/+35
| * | | Support more than 'contains'. SameElement will only allow what it can handle.Henning Baldersheim2018-06-012-7/+32
* | | | Merge pull request #6047 from vespa-engine/toregge/add-atomic-dependencies-fo...Henning Baldersheim2018-06-011-0/+5
|\ \ \ \
| * | | | Add link time dependency to atomic library (needed on Ubuntu 18.04)Tor Egge2018-06-011-0/+5
| | |_|/ | |/| |
* | | | Merge pull request #6057 from vespa-engine/vekterli/ensure-visitormanager-tes...Henning Baldersheim2018-06-011-147/+108
|\ \ \ \
| * | | | Don't assume visitor threads immediately destroy visitorsTor Brede Vekterli2018-06-011-11/+7
| * | | | Clean up some old codeTor Brede Vekterli2018-06-011-79/+44
| * | | | Clean up visitors that we've already initiatedTor Brede Vekterli2018-06-011-10/+37
| * | | | Simplify testsTor Brede Vekterli2018-06-011-45/+2
| * | | | Wait for all started visitors to finishTor Brede Vekterli2018-06-011-14/+30
* | | | | Merge pull request #6058 from vespa-engine/havardpe/hide-same-element-from-ra...Henning Baldersheim2018-06-012-0/+22
|\ \ \ \ \
| * | | | | hide same element from rankingHåvard Pettersen2018-06-012-0/+22
| |/ / / /
* | | | | Merge pull request #6050 from vespa-engine/balder/gcc-8.1-complianceHenning Baldersheim2018-06-011-1/+1
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Enable compilation on gcc 8 by avoiding ambiguity.Henning Baldersheim2018-06-011-1/+1
* | | | | Merge pull request #6060 from vespa-engine/bjorncs/identity-document-fixBjørn Christian Seime2018-06-011-1/+2
|\ \ \ \ \
| * | | | | Allow deserialization of java.time.InstantBjørn Christian Seime2018-06-011-1/+2
|/ / / / /
* | | | | Merge pull request #6056 from vespa-engine/bjorncs/fix-zpu-mappingBjørn Christian Seime2018-06-011-1/+8
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Update commentBjørn Christian Seime2018-06-011-1/+1
| * | | | Map in common zpe directory if host and not yahoo cloudBjørn Christian Seime2018-06-011-1/+8
| | |/ / | |/| |
* | | | Merge pull request #6053 from vespa-engine/balder/remove-abort-no-longer-validGeir Storli2018-06-011-1/+0
|\ \ \ \ | |/ / / |/| | |
| * | | Remove an assert that is no longer correct.Henning Baldersheim2018-06-011-1/+0
|/ / /
* | | Merge pull request #6037 from vespa-engine/bjorncs/new-unique-instance-idMorten Tokle2018-06-0121-73/+250
|\ \ \ | |/ / |/| |
| * | Use identity type to generate identity documentBjørn Christian Seime2018-05-315-26/+18
| * | Add identity type to unique instance id and signed identity documentBjørn Christian Seime2018-05-3112-28/+135
| * | Prepare for inlining of 'IdentityDocument' into 'SignedIdentityDocument'Bjørn Christian Seime2018-05-3111-22/+108
| * | Remove parent hostname from identity documentBjørn Christian Seime2018-05-312-10/+2
* | | Merge pull request #6043 from vespa-engine/hmusum/only-delete-filereferences-...Martin Polden2018-06-012-5/+30
|\ \ \