summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Automatic commit of package [vespa] release [7.2.21-1].vespa-7.2.21-1by-screwdriver2019-01-244-1/+2
| | | | | | Created by command: /usr/bin/tito tag --use-version=7.2.21 --no-auto-changelog
* Merge pull request #8210 from vespa-engine/jvenstad/deploy-to-dev-on-spec-majorJon Bratseth2019-01-232-1/+22
|\ | | | | Jvenstad/deploy to dev on spec major MERGEOK
| * 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.
* | Merge pull request #8202 from ↵Jon Bratseth2019-01-232-4/+3
|\ \ | |/ |/| | | | | vespa-engine/bratseth/deployment-spec-majorVersion-takes-precedence Deployment spec majorVersion take precedence over Application value MERGEOK
| * Deployment spec majorVersion take precedence over Application valueJon Bratseth2019-01-222-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.
* | Merge pull request #8209 from vespa-engine/balder/test-not-neededJon Bratseth2019-01-221-6/+0
|\ \ | | | | | | remove test that does not make that much sense. MERGEOK
| * | remove test that does not make that much sense.Henning Baldersheim2019-01-221-6/+0
|/ /
* | Merge pull request #8208 from vespa-engine/balder/remove-docprocserviceJon Bratseth2019-01-225-8/+2
|\ \ | |/ |/| No more docprocservice. MERGEOK
| * Don't expect docprocservice as service typeJon Bratseth2019-01-224-4/+2
| |
| * No more docprocservice.Henning Baldersheim2019-01-221-4/+0
|/
* Merge pull request #8198 from vespa-engine/7Geir Storli2019-01-211031-36940/+9027
|\ | | | | 7 MERGEOK
| * Adjust java dependencies and path to java libraries.Tor Egge2019-01-211-4/+6
| |
| * Fix accidental import of java.sql.DateBjørn Christian Seime2019-01-211-1/+1
| |
| * Set -XX:ActiveProcessorCount option if set in configHarald Musum2019-01-212-0/+13
| | | | | | | | Use VESPA_CONTAINER_JVMARGS if set
| * Repair serialization of boolean fields.Tor Egge2019-01-212-3/+3
| |
| * Follow api changeHenning Baldersheim2019-01-213-1/+17
| |
| * Render single value position as object to match how top-level position ↵Geir Storli2019-01-215-58/+70
| | | | | | | | fields are rendered.
| * Update abi specs for 7.gjoranv2019-01-2114-1355/+235
| |
| * Remove removed ctor in InnerNodeVector from abi spec.gjoranv2019-01-211-2/+1
| |
| * Remove deprecated duplicate Version classJon Bratseth2019-01-214-288/+2
| |
| * Remove ymum from groupingJon Bratseth2019-01-2112-134/+6
| |
| * Set 7-SNAPSHOT for new module, and remove redundant 'name'.gjoranv2019-01-211-3/+2
| |
| * Revert "Merge pull request #7974 from ↵Jon Bratseth2019-01-2114-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-2114-25/+81
| |
| * Remove deprecated methodsJon Bratseth2019-01-212-21/+0
| |
| * Remove deprecated methodsJon Bratseth2019-01-211-1/+1
| |
| * Remove SeverJon Bratseth2019-01-215-21/+2
| |
| * Remove Query.getSessionId(boolean)Jon Bratseth2019-01-218-39/+23
| |
| * Don't expect uri fieldJon Bratseth2019-01-211-2/+0
| |
| * Testing of dynamic summary renderingJon Bratseth2019-01-219-154/+372
| |
| * Nonfunctional changes onlyJon Bratseth2019-01-2120-27/+43
| |
| * use IntegerContent to retrieve positionsArne Juul2019-01-211-21/+11
| |
| * add code to insert position attributes directlyArne Juul2019-01-212-5/+68
| |
| * provide defaults, making it easier to mock up an implementationArne Juul2019-01-212-6/+18
| |
| * JDK 11 updates.gjoranv2019-01-213-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-211-2/+2
| |
| * Remove values that are removed in config def file on Vespa 7.Geir Storli2019-01-211-2/+0
| |
| * catch up with Vespa 7 workArne Juul2019-01-211-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-211-14/+0
| |
| * Do not provide commons-codec at build time.gjoranv2019-01-214-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-211-0/+1
| |
| * Ignore .rng and .xsd files to reduce git noiseBjørn Christian Seime2019-01-211-0/+2
| |
| * Add back method that was intended to be removed in Vespa 7Bjørn Christian Seime2019-01-211-0/+5
| |
| * Add space after commas.gjoranv2019-01-211-9/+9
| | | | | | | | | | - It's common practice, and makes exportPackages.properties easier to split.
| * Add version-less exports for some javax packagesgjoranv2019-01-211-0/+12
| | | | | | | | | | | | | | .. to compensate for the fact that 6 exported these packages with both the artifact version and "0.0.0.1_008_JavaSE". The latter takes precedence because it was listed first in the manifest, such that user bundles import these package with range [0,1).
| * Set 7-SNAPSHOT for new modules.gjoranv2019-01-212-4/+4
| |
| * Remove unused search.io setting.Geir Storli2019-01-211-4/+0
| |
| * disallow old top-level "cluster", hope nobody uses itArne Juul2019-01-212-4/+9
| | | | | | | | update todo for old top-level tag "config", used by several unit tests.
| * throw away pre-6.0 codeArne Juul2019-01-211-14/+1
| |