summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #8184 from vespa-engine/balder/control-environment-varJon Bratseth2019-01-235-2/+47
|\
| * jdisc -> containerHenning Baldersheim2019-01-181-4/+3
| * Rename and reduce visibility of ENVIRONMENT_VARIABLES_ELEMENTHenning Baldersheim2019-01-182-3/+2
| * Use xml element syntax to add environment variables.Henning Baldersheim2019-01-184-5/+23
| * It is a long time since YELL_MA_EURO=INXIGHT made any sense...Henning Baldersheim2019-01-171-1/+1
| * Add control of extra environment variables.Henning Baldersheim2019-01-175-0/+29
* | Merge pull request #8180 from vespa-engine/bratseth/handle-multiple-sync-resu...Jon Bratseth2019-01-2317-69/+108
|\ \
| * | Handle multiple results per document in a sync batchJon Bratseth2019-01-231-0/+17
| * | Use same reservation expiry in all zonesHarald Musum2019-01-231-2/+1
| * | Build master branchBjørn Christian Seime2019-01-231-1/+1
| * | We execute the java binary explicitly when compiling. Need to adjust PATH. Al...Arnstein Ressem2019-01-231-1/+2
| * | Copr does not allow using the alternatives command. Setting JAVA_HOME is enou...Arnstein Ressem2019-01-231-2/+3
| * | Use major from deployment.xml when deploying to dev/perfJon Marius Venstad2019-01-232-4/+4
| * | Revert "Default to system version when deploying to dev"Jon Marius Venstad2019-01-232-1/+22
| * | remove test that does not make that much sense.Henning Baldersheim2019-01-231-6/+0
| * | Don't expect docprocservice as service typeJon Bratseth2019-01-234-4/+2
| * | No more docprocservice.Henning Baldersheim2019-01-231-4/+0
| * | Deployment spec majorVersion take precedence over Application valueJon Bratseth2019-01-232-4/+3
| * | Adjust java dependencies and path to java libraries.Tor Egge2019-01-231-4/+6
| * | Fix accidental import of java.sql.DateBjørn Christian Seime2019-01-231-1/+1
| * | Set -XX:ActiveProcessorCount option if set in configHarald Musum2019-01-232-0/+13
| * | Repair serialization of boolean fields.Tor Egge2019-01-232-3/+3
| * | Follow api changeHenning Baldersheim2019-01-233-1/+17
| * | Render single value position as object to match how top-level position fields...Geir Storli2019-01-235-58/+70
| * | Update abi specs for 7.gjoranv2019-01-2314-1355/+235
| * | Remove removed ctor in InnerNodeVector from abi spec.gjoranv2019-01-231-2/+1
| * | Remove deprecated duplicate Version classJon Bratseth2019-01-234-288/+2
| * | Remove ymum from groupingJon Bratseth2019-01-2312-134/+6
| * | Set 7-SNAPSHOT for new module, and remove redundant 'name'.gjoranv2019-01-231-3/+2
| * | Revert "Merge pull request #7974 from vespa-engine/revert-7973-bratseth/searc...Jon Bratseth2019-01-2314-81/+25
| * | Revert "Bratseth/search container deprecations"Jon Bratseth2019-01-2314-25/+81
| * | Remove deprecated methodsJon Bratseth2019-01-232-21/+0
| * | Remove deprecated methodsJon Bratseth2019-01-231-1/+1
| * | Remove SeverJon Bratseth2019-01-235-21/+2
| * | Remove Query.getSessionId(boolean)Jon Bratseth2019-01-238-39/+23
| * | Don't expect uri fieldJon Bratseth2019-01-231-2/+0
| * | Testing of dynamic summary renderingJon Bratseth2019-01-239-154/+372
| * | Nonfunctional changes onlyJon Bratseth2019-01-2320-27/+43
| * | use IntegerContent to retrieve positionsArne Juul2019-01-231-21/+11
| * | add code to insert position attributes directlyArne Juul2019-01-232-5/+68
| * | provide defaults, making it easier to mock up an implementationArne Juul2019-01-232-6/+18
| * | JDK 11 updates.gjoranv2019-01-233-7/+21
| * | Set version to 7-SNAPSHOT for new module.gjoranv2019-01-231-2/+2
| * | Remove values that are removed in config def file on Vespa 7.Geir Storli2019-01-231-2/+0
| * | catch up with Vespa 7 workArne Juul2019-01-231-2/+2
| * | Remove values that are removed in config def file on Vespa 7.Geir Storli2019-01-231-14/+0
| * | Do not provide commons-codec at build time.gjoranv2019-01-234-6/+13
| * | Makefile is committed - do not ignoreBjørn Christian Seime2019-01-231-0/+1
| * | Ignore .rng and .xsd files to reduce git noiseBjørn Christian Seime2019-01-231-0/+2
| * | Add back method that was intended to be removed in Vespa 7Bjørn Christian Seime2019-01-231-0/+5