summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Automatic commit of package [vespa] release [7.2.21-1].vespa-7.2.21-1by-screwdriver2019-01-244-1/+2
* Merge pull request #8210 from vespa-engine/jvenstad/deploy-to-dev-on-spec-majorJon Bratseth2019-01-232-1/+22
|\
| * 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
* | Merge pull request #8202 from vespa-engine/bratseth/deployment-spec-majorVers...Jon Bratseth2019-01-232-4/+3
|\ \ | |/ |/|
| * Deployment spec majorVersion take precedence over Application valueJon Bratseth2019-01-222-4/+3
* | 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.Henning Baldersheim2019-01-221-6/+0
|/ /
* | Merge pull request #8208 from vespa-engine/balder/remove-docprocserviceJon Bratseth2019-01-225-8/+2
|\ \ | |/ |/|
| * 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
|\
| * 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
| * 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 fields...Geir Storli2019-01-215-58/+70
| * 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 vespa-engine/revert-7973-bratseth/searc...Jon Bratseth2019-01-2114-81/+25
| * 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
| * 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
| * 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
| * 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
| * Add version-less exports for some javax packagesgjoranv2019-01-211-0/+12
| * 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
| * throw away pre-6.0 codeArne Juul2019-01-211-14/+1