summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Revert "Revert "Reapply "Create seperate bundles compiled against different Z...Harald Musum2019-10-2820-49/+507
* Merge pull request #11131 from vespa-engine/vekterli/add-safe-mode-support-to...Tor Brede Vekterli2019-10-282-3/+13
|\
| * Add "safe mode" flag support to vespa-set-node-state toolTor Brede Vekterli2019-10-282-3/+13
* | Merge pull request #11130 from vespa-engine/toregge/use-attribute-combiner-su...Geir Storli2019-10-282-0/+60
|\ \
| * | Use TestUtil.joinLines to simplify generation of multi-line string.Tor Egge2019-10-281-23/+26
| * | Use attribute combiner summary transform when source field is a complexTor Egge2019-10-282-0/+57
* | | Merge pull request #11132 from vespa-engine/olaa/provided-json-modulegjoranv2019-10-281-4/+5
|\ \ \
| * | | Set org.json to provided scopeOla Aunrønning2019-10-281-4/+5
* | | | Merge pull request #11129 from vespa-engine/revert-11126-revert-11123-revert-...Harald Musum2019-10-2820-507/+49
|\ \ \ \
| * | | | Revert "Reapply "Create seperate bundles compiled against different ZooKeeper...Harald Musum2019-10-2820-507/+49
| |/ / /
* | | | Merge pull request #11110 from vespa-engine/mpolden/deployment-contextJon Marius Venstad2019-10-2810-476/+643
|\ \ \ \ | |/ / / |/| | |
| * | | Update controller-server/src/test/java/com/yahoo/vespa/hosted/controller/depl...Jon Marius Venstad2019-10-281-1/+1
| * | | Extract DeploymentContext from InternalDeploymentTesterMartin Polden2019-10-2810-476/+643
* | | | Merge pull request #11126 from vespa-engine/revert-11123-revert-11119-revert-...Harald Musum2019-10-2820-49/+507
|\ \ \ \
| * | | | Make sure to use same version of slf4j-log4j12 as slf4j-apiHarald Musum2019-10-272-0/+10
| * | | | Revert "Revert "Reapply "Create seperate bundles compiled against different Z...Harald Musum2019-10-2720-49/+497
* | | | | Merge pull request #11128 from vespa-engine/bratseth/remove-printlnsJon Bratseth2019-10-271-2/+0
|\ \ \ \ \
| * | | | | Remove printlnsJon Bratseth2019-10-271-2/+0
|/ / / / /
* | | | | Merge pull request #11127 from vespa-engine/bratseth/query-profiles-local-var...Jon Bratseth2019-10-272-17/+43
|\ \ \ \ \
| * | | | | Generate combinations of variants found in all pathsJon Bratseth2019-10-272-17/+43
* | | | | | Merge pull request #11121 from vespa-engine/gjoranv/deconstruct-all-in-one-taskgjoranv2019-10-271-26/+29
|\ \ \ \ \ \
| * | | | | | Deconstruct all components in one task.gjoranv2019-10-261-26/+29
* | | | | | | Merge pull request #11125 from vespa-engine/hmusum/longer-timeout-for-config-...Harald Musum2019-10-271-1/+1
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Increase client timeout for config requestsHarald Musum2019-10-271-1/+1
* | | | | | | Merge pull request #11123 from vespa-engine/revert-11119-revert-11118-revert-...Jon Bratseth2019-10-2720-497/+49
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Revert "Reapply "Create seperate bundles compiled against different ZooKeeper...Harald Musum2019-10-2720-497/+49
* | | | | | | Merge pull request #11122 from shilajeet/masterJon Bratseth2019-10-271-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | made grammatical correction.shw26122019-10-271-1/+1
* | | | | | | Merge pull request #11119 from vespa-engine/revert-11118-revert-11117-revert-...Harald Musum2019-10-2720-49/+497
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Revert "Revert "Reapply "Create seperate bundles compiled against different Z...Harald Musum2019-10-2620-49/+497
* | | | | | | Merge pull request #11120 from vespa-engine/gjoranv/deconstruct-all-component...Harald Musum2019-10-269-51/+59
|\ \ \ \ \ \ \ | |/ / / / / / |/| / / / / / | |/ / / / /
| * | | | | minor: replace Arrays.asList with singletonListgjoranv2019-10-261-1/+3
| * | | | | Add Vespa 8 TODOgjoranv2019-10-261-0/+1
| * | | | | minor non-functional changes:gjoranv2019-10-262-6/+6
| * | | | | Schedule deconstruct of all components with one call.gjoranv2019-10-267-44/+49
* | | | | | Merge pull request #11118 from vespa-engine/revert-11117-revert-11115-revert-...Harald Musum2019-10-2620-497/+49
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Revert "Reapply "Create seperate bundles compiled against different ZooKeeper...Harald Musum2019-10-2620-497/+49
|/ / / / /
* | | | | Merge pull request #11117 from vespa-engine/revert-11115-revert-11113-revert-...Harald Musum2019-10-2620-49/+497
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Revert "Revert "Reapply "Create seperate bundles compiled against different Z...Harald Musum2019-10-2620-49/+497
|/ / / /
* | | | Merge pull request #11116 from fanisaputra98/masterJon Bratseth2019-10-261-0/+1
|\ \ \ \
| * | | | Update pom.xmlFani Saputra2019-10-261-0/+1
* | | | | Merge pull request #11115 from vespa-engine/revert-11113-revert-11112-revert-...Jon Bratseth2019-10-2620-497/+49
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Revert "Reapply "Create seperate bundles compiled against different ZooKeeper...Harald Musum2019-10-2620-497/+49
|/ / / /
* | | | Merge pull request #11113 from vespa-engine/revert-11112-revert-11101-revert-...Harald Musum2019-10-2620-49/+497
|\ \ \ \
| * | | | Fix symlinkHarald Musum2019-10-251-1/+1
| * | | | Revert "Revert "Reapply "Create seperate bundles compiled against different Z...Harald Musum2019-10-2520-49/+497
* | | | | Merge pull request #11114 from vespa-engine/jvenstad/use-production-for-prod-...Jon Bratseth2019-10-265-19/+27
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Use default instance prod deployments for prod test config for user instancesJon Marius Venstad2019-10-264-18/+26
| * | | | Use "production" for prod job namesJon Marius Venstad2019-10-261-1/+1
|/ / / /
* | | | Merge pull request #11112 from vespa-engine/revert-11101-revert-11098-revert-...Valerij Fredriksen2019-10-2520-497/+49
|\ \ \ \