summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #3573 from vespa-engine/vekterli/add-wanted-document-count...Tor Brede Vekterli2017-09-296-41/+146
|\
| * Remove redundant identity transform of OptionalTor Brede Vekterli2017-09-281-1/+1
| * Add wantedDocumentCount parameter to Document V1 visiting APITor Brede Vekterli2017-09-286-41/+146
* | Merge pull request #3578 from vespa-engine/hakon/map-supermodel-to-servicemodelhakonhall2017-09-299-0/+629
|\ \
| * | Remove reference to ytracecleanerHåkon Hallingstad2017-09-291-1/+0
| * | Map SuperModel to ServiceModelHåkon Hallingstad2017-09-289-0/+630
* | | Merge pull request #3583 from vespa-engine/hmusum/log-time-used-in-stepsHenning Baldersheim2017-09-291-0/+2
|\ \ \
| * | | Log at debug level time used in prepare stepsHarald Musum2017-09-291-0/+2
* | | | Merge pull request #3574 from vespa-engine/geirst/add-disk-usage-sampling-for...Geir Storli2017-09-2915-130/+264
|\ \ \ \
| * | | | Change DiskMemUsageSampler to sample disk usage using directory scan if disk ...Geir Storli2017-09-277-79/+107
| * | | | Extend HwInfo with disk size, if disk is shared and memory size and sample si...Geir Storli2017-09-279-51/+157
* | | | | Merge pull request #3579 from vespa-engine/freva/build-docker-imageHarald Musum2017-09-292-2/+2
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Upgrade docker-javaValerij Fredriksen2017-09-282-2/+2
* | | | | Merge pull request #3513 from vespa-engine/ldalves/cost-metricsTorbjørn Smørgrav2017-09-292-26/+16
|\ \ \ \ \
| * | | | | rename SystemMetrics class/tests and return a Map instead of a ListLeandro Alves2017-09-282-26/+16
* | | | | | Merge pull request #3567 from vespa-engine/mpolden/allow-deploy-without-projectMartin Polden2017-09-298-99/+150
|\ \ \ \ \ \
| * | | | | | Handle null project IDMartin Polden2017-09-282-8/+39
| * | | | | | Allow direct deploy for applications without a projectMartin Polden2017-09-285-69/+60
| * | | | | | Use DeploymentTester in tests that deployMartin Polden2017-09-282-23/+52
* | | | | | | Merge pull request #3575 from vespa-engine/havardpe/cross-language-tensor-con...Lester Solbakken2017-09-288-3/+413
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | application to facilitate cross-language tensor conformance testing - WIPHåvard Pettersen2017-09-288-3/+413
* | | | | | | Merge pull request #3570 from vespa-engine/toregge/more-datatype-checking-in-...Geir Storli2017-09-2814-40/+53
|\ \ \ \ \ \ \
| * | | | | | | Actual attribute vector is not needed when only checking feature executor setup.Tor Egge2017-09-281-3/+0
| * | | | | | | Narrow down the set of attribute vector data types allowed for featureTor Egge2017-09-2813-40/+46
| * | | | | | | Test that setting up tensor attribute for attributeMatch feature fails.Tor Egge2017-09-281-0/+10
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge pull request #3572 from vespa-engine/hmusum/set-timeout-for-prepareMartin Polden2017-09-282-2/+7
|\ \ \ \ \ \ \
| * | | | | | | Set correct timeout for prepare requestsHarald Musum2017-09-282-2/+7
| |/ / / / / /
* | | | | | | Merge pull request #3562 from vespa-engine/revert-3561-revert-3554-aressem/re...Arnstein Ressem2017-09-2872-309/+347
|\ \ \ \ \ \ \
| * | | | | | | Use the install_config_definition for def files.Arnstein Ressem2017-09-281-6/+4
| * | | | | | | Revert "Revert "Aressem/remove post install script""Arnstein Ressem2017-09-2772-309/+349
* | | | | | | | Merge pull request #3571 from vespa-engine/balder/relax-cpu-architecture-depe...Arnstein Ressem2017-09-282-9/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Do not require any specific cpu architecture.Henning Baldersheim2017-09-282-9/+1
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge pull request #3569 from vespa-engine/gjoranv/use-explicit-versionsBjørn Christian Seime2017-09-281-59/+73
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Use explicit version or range for all deps.gjoranv2017-09-281-59/+73
|/ / / / / / /
* | | | | | | Merge pull request #3558 from vespa-engine/toregge/validate-datatype-as-part-...Geir Storli2017-09-286-6/+91
|\ \ \ \ \ \ \
| * | | | | | | Limit data types allowed for attribute match feature.Tor Egge2017-09-272-2/+4
| * | | | | | | Be more explicit when creating data types masks.Tor Egge2017-09-271-4/+17
| * | | | | | | Hide internal state of ParameterDataTypeSet.Tor Egge2017-09-271-5/+8
| * | | | | | | Validate data type as part of validating blueprint parameters.Tor Egge2017-09-274-4/+71
* | | | | | | | Merge pull request #3496 from vespa-engine/hmusum/dont-rethrow-application-lo...Harald Musum2017-09-281-1/+2
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Do not rethrow ApplicationLockException as IllegalArgumentExceptionHarald Musum2017-09-221-1/+2
* | | | | | | | Merge pull request #3565 from vespa-engine/revert-3553-mpolden/allow-deploy-w...Harald Musum2017-09-287-112/+92
|\ \ \ \ \ \ \ \
| * | | | | | | | Revert "Allow deploy without project"Martin Polden2017-09-287-112/+92
|/ / / / / / / /
* | | | | | | | Merge pull request #3564 from vespa-engine/bratseth/remove-team-linkKristian Aune2017-09-282-4/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove team link as it only works for membersJon Bratseth2017-09-272-4/+4
* | | | | | | | | Merge pull request #3544 from vespa-engine/bratseth/protect-against-send-dead...Jon Bratseth2017-09-2732-56/+91
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Return permissions before calling listenerJon Bratseth2017-09-261-7/+4
| * | | | | | | | | Nonfunctional changes onlyJon Bratseth2017-09-2632-49/+87
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #3548 from vespa-engine/balder/preserve-framepointer-c++Henning Baldersheim2017-09-271-1/+1
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | The cost of preserving the framepointer is small enough to allow it being def...Henning Baldersheim2017-09-271-1/+1
| |/ / / / / / /