summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Automatic commit of package [vespa] release [6.271.25-1].vespa-6.271.25-1by-screwdriver2018-08-094-1/+2
* Merge pull request #6485 from vespa-engine/balder/transfer-when-selecting-the...Henning Baldersheim2018-08-0810-113/+135
|\
| * Improve tests by tightening it.Henning Baldersheim2018-08-082-19/+23
| * Adderss comments from @havardpeHenning Baldersheim2018-08-081-3/+3
| * Add an optional diversification filter that is applied inline when selecting ...Henning Baldersheim2018-07-273-13/+56
| * Remove unused code only used in testsHenning Baldersheim2018-07-273-29/+8
| * Select the hits to rerank in the selectBest part instead of a later copy.Henning Baldersheim2018-07-279-72/+68
* | Merge pull request #6518 from vespa-engine/havardpe/avoid-old-style-varargs-w...Henning Baldersheim2018-08-081-4/+15
|\ \
| * | Avoid using the 'convenient' way to specify parameter types whenHåvard Pettersen2018-08-081-4/+15
* | | Merge pull request #6517 from vespa-engine/balder/do-not-use-dumpHenning Baldersheim2018-08-083-13/+11
|\ \ \
| * | | dump -> print(stream)Henning Baldersheim2018-08-083-13/+11
| |/ /
* | | Merge pull request #6521 from vespa-engine/jvenstad/deploymentsJon Bratseth2018-08-088-70/+177
|\ \ \ | |/ / |/| |
| * | Store version information in run statusJon Marius Venstad2018-08-088-70/+177
|/ /
* | Merge pull request #6515 from vespa-engine/balder/do-not-follow-nullptrHenning Baldersheim2018-08-071-2/+5
|\ \
| * \ Merge branch 'balder/do-not-follow-nullptr' of github.com:vespa-engine/vespa ...Henning Baldersheim2018-08-070-0/+0
| |\ \
| | * | Prevent following the nullptr.Henning Baldersheim2018-08-071-2/+5
| |/ / |/| |
| * | Prevent following the nullptr.Henning Baldersheim2018-08-071-2/+5
|/ /
* | Merge pull request #6514 from vespa-engine/jvenstad/deploymentsJon Bratseth2018-08-0716-124/+54
|\ \
| * | Don't throttle canaries when failingJon Marius Venstad2018-08-073-3/+3
| * | Inline Delegating- and InternalBuildServiceJon Marius Venstad2018-08-078-88/+23
| * | Some simplificationsJon Marius Venstad2018-08-073-13/+11
| * | Renamed Testers to TestCloudJon Marius Venstad2018-08-064-20/+17
* | | Merge pull request #6513 from vespa-engine/toregge/deactivate-content-layer-b...Henning Baldersheim2018-08-074-12/+30
|\ \ \
| * | | Deactivate all buckets in content layer bucket db when derived clusterTor Egge2018-08-074-12/+30
|/ / /
* | | Merge pull request #6496 from vespa-engine/henrhoi/api-for-new-parameter-with...Henrik Høiness2018-08-0713-6/+2171
|\ \ \
| * | | Added urls for the Select ReferenceHenrik2018-08-071-2/+2
| * | | Changes from review.Henrik2018-08-076-28/+48
| * | | Solve conflicting filesHenrik2018-08-0660-629/+856
| |\ \ \
| * | | | Added parsing of multiple pipesHenrik2018-08-062-6/+32
| * | | | Committing for Travis rebuild, talked with @mpolden. Said it would solve the ...Henrik2018-08-031-1/+1
| * | | | Added class doc for SelectParser.javaHenrik2018-08-031-0/+9
| * | | | Added SELECT parameter to provider.def - missed that ProviderConfig.java was ...Henrik2018-08-032-2/+3
| * | | | Added parsing of Grouping from JSON to String. Now parsing grouping-parameter...Henrik2018-08-025-54/+69
| * | | | Added copyrightHenrik2018-08-021-8/+1
| * | | | SelectParser now handles ''all'' testcases from YQLParserTestCase. Class may ...Henrik2018-08-022-146/+588
| * | | | Created new parameter SELECT with subparameters WHERE and GROUPING. Started o...Henrik2018-08-0210-2/+1662
* | | | | Merge pull request #6511 from vespa-engine/balder/use-llvm-dyn_castHenning Baldersheim2018-08-071-7/+4
|\ \ \ \ \
| * | | | | newer llvm releases have dropped virtual.Henning Baldersheim2018-08-071-7/+4
|/ / / / /
* | | | | Merge pull request #6510 from vespa-engine/bjorncs/allow-missing-documentMorten Tokle2018-08-071-1/+1
|\ \ \ \ \
| * | | | | Allow signed identity document without wrapped documentBjørn Christian Seime2018-08-071-1/+1
|/ / / / /
* | | | | Merge pull request #6509 from vespa-engine/revert-6482-bjorncs/remove-wrapped...Arnstein Ressem2018-08-0710-38/+436
|\ \ \ \ \
| * | | | | Revert "Bjorncs/remove wrapped identity document"Morten Tokle2018-08-0710-38/+436
|/ / / / /
* | | | | Merge pull request #6508 from vespa-engine/aressem/run-single-threaded-mvn-fo...Jon Marius Venstad2018-08-071-1/+1
|\ \ \ \ \
| * | | | | Use only 1 thread when compiling. javacc-maven-plugin does not support multip...Arnstein Ressem2018-08-061-1/+1
* | | | | | Merge pull request #6507 from vespa-engine/havardpe/avoid-hardcoded-ports-in-...Henning Baldersheim2018-08-0615-74/+50
|\ \ \ \ \ \
| * | | | | | meaningless change to re-run CLA test, maybe...Håvard Pettersen2018-08-061-1/+0
| * | | | | | avoid hardcoded port numbers in jrt testsHåvard Pettersen2018-08-0615-73/+50
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #6506 from vespa-engine/mpolden/fix-raceValerij Fredriksen2018-08-062-3/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Re-enable testMartin Polden2018-08-061-2/+0
| * | | | | Ensure add happens before removeMartin Polden2018-08-061-1/+1