summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #8184 from vespa-engine/balder/control-environment-varJon Bratseth2019-01-235-2/+47
|\ | | | | Balder/control environment var MERGEOK
| * 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 ↵Jon Bratseth2019-01-2317-69/+108
|\ \ | | | | | | | | | | | | vespa-engine/bratseth/handle-multiple-sync-results-per-document Handle multiple results per document in a sync batch MERGEOK
| * | 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
| | | | | | | | | | | | | | | There is no difference in how we build models in dev and other zones anymore, and there are customers with large apps that need more than 10 minutes
| * | Build master branchBjørn Christian Seime2019-01-231-1/+1
| | |
| * | We execute the java binary explicitly when compiling. Need to adjust PATH. ↵Arnstein Ressem2019-01-231-1/+2
| | | | | | | | | | | | Also parallell compilation with mvn works now.
| * | Copr does not allow using the alternatives command. Setting JAVA_HOME is ↵Arnstein Ressem2019-01-231-2/+3
| | | | | | | | | | | | enough for mvn to pick up JDK 11.
| * | 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
| | | | | | | | | | | | This reverts commit 416ae7ee0bc8431eca0a4de5c014c232bd786f06.
| * | 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
| | | | | | | | | | | | | | | | | | | | | Overriding the major version set in the deployment spec does not work because config servers will filter out major versions based on the deployment spec, and it is not useful because we should respect applications explicit choices when specified.
| * | 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
| | | | | | | | | | | | Use VESPA_CONTAINER_JVMARGS if set
| * | 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 ↵Geir Storli2019-01-235-58/+70
| | | | | | | | | | | | fields are rendered.
| * | 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 ↵Jon Bratseth2019-01-2314-81/+25
| | | | | | | | | | | | | | | | | | | | | vespa-engine/revert-7973-bratseth/search-container-deprecations" This reverts commit 5767288d80e85940e675f7dd157f2b6c1d2ceeb5, reversing changes made to 37de7ac33454363489156e06597bffb3422756dc.
| * | 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
| | | | | | | | | | | | | | | | | | | | | | | | - Use Opcodes.ASM7 - Inherit maven-plugin-api version from parent (currently 3.6.0) - Use enforcer-plugin instead of Maven 2 prerequisites - Require maven 3.5 as for the rest of Vespa - Inherit asm version from parent to stay updated
| * | 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
| | | | | | | | | | | | | | | * use vespaversion as default for test_framework_version * target Java 11
| * | 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
| | | | | | | | | | | | | | | - We effectively stopped providing it runtime since https://github.com/vespa-engine/vespa/pull/7696
| * | 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
| | |