summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Revert "Merge pull request #6626 from ↵Jon Bratseth2018-08-2015-350/+210
| | | | | | vespa-engine/revert-6625-bratseth/generate-rank-profiles-for-all-models-part-2-3"" This reverts commit c7cfd9f4742f398331839ed0f2ceeee55c68a791.
* Revert "Merge pull request #6626 from ↵Jon Bratseth2018-08-2015-210/+350
| | | | | | | vespa-engine/revert-6625-bratseth/generate-rank-profiles-for-all-models-part-2-3" This reverts commit c6d642b55558203a6eddd79efbc232bb34ec8e52, reversing changes made to 59ffc5091b8246674843deea81a11a917abf801e.
* Merge pull request #6626 from ↵Jon Bratseth2018-08-2015-350/+210
|\ | | | | | | | | vespa-engine/revert-6625-bratseth/generate-rank-profiles-for-all-models-part-2-3 Revert "Bratseth/generate rank profiles for all models part 2 3"
| * Revert "Bratseth/generate rank profiles for all models part 2 3"Jon Bratseth2018-08-2015-350/+210
|/
* Merge pull request #6625 from ↵Lester Solbakken2018-08-2015-210/+350
|\ | | | | | | | | vespa-engine/bratseth/generate-rank-profiles-for-all-models-part-2-3 Bratseth/generate rank profiles for all models part 2 3
| * Add deactivated capability to import all modelsJon Bratseth2018-08-205-12/+28
| |
| * Revert "Merge pull request #6619 from ↵Jon Bratseth2018-08-2015-210/+334
|/ | | | | | | vespa-engine/revert-6611-revert-6596-revert-6584-bratseth/generate-rank-profiles-for-all-models-part-2" This reverts commit 0437e8cc1d550fb8c6d24ffe4da813067c542f62, reversing changes made to 1715b8393827c159f8709033075066b29932f852.
* Merge pull request #6624 from vespa-engine/jvenstad/testrunner-loggingJon Marius Venstad2018-08-191-1/+6
|\ | | | | Retry HTTP failures, and log less stack traces.
| * Retry HTTP failures, and log less stack traces.Jon Marius Venstad2018-08-191-1/+6
| |
* | Merge pull request #6623 from ↵Henning Baldersheim2018-08-192-8/+6
|\ \ | | | | | | | | | | | | vespa-engine/toregge/stop-calling-setbasefilename-when-flushing-attribute Don't set attribute base file name when flushing attribute.
| * | Reduce dependency on AttributeVector::BaseName.Tor Egge2018-08-191-4/+4
| | |
| * | Adjust warning when failing to save document meta store.Tor Egge2018-08-191-2/+2
| | |
| * | Don't set attribute base file name when flushing attribute, it is noTor Egge2018-08-192-2/+0
|/ / | | | | | | longer used to specify where to save the attribute.
* | Merge pull request #6622 from vespa-engine/jvenstad/testrunner-loggingHarald Musum2018-08-192-1/+11
|\| | | | | Jvenstad/testrunner logging
| * Dummy access control to pass validationJon Marius Venstad2018-08-192-0/+10
| |
| * Print application version idJon Marius Venstad2018-08-171-1/+1
| |
* | Merge pull request #6621 from ↵Henning Baldersheim2018-08-1810-29/+27
|\ \ | | | | | | | | | | | | vespa-engine/toregge/rename-saveas-method-to-save-method Rename AttributeVector::saveAs() method to save().
| * | Rename AttributeVector::saveAs() method to save().Tor Egge2018-08-1710-29/+27
|/ / | | | | | | Don't update attribute vector file name in the renamed method.
* | Merge pull request #6618 from ↵Henning Baldersheim2018-08-173-35/+0
|\ \ | | | | | | | | | | | | vespa-engine/toregge/remove-unused-getindexname-method Remove unused getIndexName method.
| * | Remove unused getIndexName method.Tor Egge2018-08-173-35/+0
| | |
* | | Merge pull request #6620 from vespa-engine/freva/fix-typoHarald Musum2018-08-172-2/+2
|\ \ \ | | | | | | | | Fix typo
| * | | Fix typoValerij Fredriksen2018-08-172-2/+2
|/ / /
* | | Merge pull request #6619 from ↵Harald Musum2018-08-1715-334/+210
|\ \ \ | |/ / |/| | | | | | | | vespa-engine/revert-6611-revert-6596-revert-6584-bratseth/generate-rank-profiles-for-all-models-part-2 Revert "Revert "Revert "Convert all outputs"""
| * | Revert "Revert "Revert "Convert all outputs"""Jon Marius Venstad2018-08-1715-334/+210
|/ /
* | Merge pull request #6617 from vespa-engine/jvenstad/testrunner-loggingJon Marius Venstad2018-08-172-2/+2
|\| | | | | Add /
| * ... in test file as wellJon Marius Venstad2018-08-171-1/+1
| |
| * Add /Jon Marius Venstad2018-08-171-1/+1
|/
* Merge pull request #6616 from vespa-engine/balder/no-snapshotHenning Baldersheim2018-08-1710-109/+28
|\ | | | | Remove snapshot concept access
| * Remove snapshot concept accessHenning Baldersheim2018-08-1710-109/+28
|/
* Merge pull request #6615 from ↵Henning Baldersheim2018-08-177-31/+13
|\ | | | | | | | | vespa-engine/toregge/pass-file-name-to-attribute-vector-save-method Pass file name to attribute vector save method
| * Remove attribute vector saveAs method with two arguments.Tor Egge2018-08-175-20/+5
| |
| * Pass file name to attribute vector save method.Tor Egge2018-08-175-12/+9
|/
* Merge pull request #6612 from ↵Henning Baldersheim2018-08-1720-36/+37
|\ | | | | | | | | vespa-engine/toregge/add-file-name-to-low-level-attribute-save-methods Add file name to lowe level attribute save methods.
| * Add file name to lowe level attribute save methods.Tor Egge2018-08-1720-36/+37
|/
* Merge pull request #6606 from ↵Håkon Hallingstad2018-08-171-1/+7
|\ | | | | | | | | vespa-engine/hakonhall/avoid-exitonoutofmemoryerror Avoid ExitOnOutOfMemoryError
| * Add ExitOnOutOfMemoryError TODOHåkon Hallingstad2018-08-171-0/+6
| |
| * Avoid ExitOnOutOfMemoryErrorHåkon Hallingstad2018-08-161-1/+1
| | | | | | | | | | | | | | The -XX:+ExitOnOutOfMemoryError flag was introduced in Java 8 update 92, thus not compatible with all Java 8 installations. http://www.oracle.com/technetwork/java/javase/8u92-relnotes-2949471.html
* | Merge pull request #6611 from ↵Lester Solbakken2018-08-1715-210/+334
|\ \ | | | | | | | | | | | | vespa-engine/revert-6596-revert-6584-bratseth/generate-rank-profiles-for-all-models-part-2 Revert "Revert "Convert all outputs""
| * | Avoid ApplicationPackage.getFilesJon Bratseth2018-08-175-25/+34
| | |
| * | Revert "Revert "Convert all outputs""Jon Bratseth2018-08-1712-196/+311
|/ /
* | Merge pull request #6610 from vespa-engine/hmusum/specify-http-serverValerij Fredriksen2018-08-172-0/+2
|\ \ | | | | | | Add required server element
| * | Add required server elementHarald Musum2018-08-172-0/+2
|/ /
* | Merge pull request #6608 from vespa-engine/jvenstad/close-zip-streamHarald Musum2018-08-161-0/+1
|\ \ | | | | | | Close it!
| * | Close it!Jon Marius Venstad2018-08-161-0/+1
|/ /
* | Merge pull request #6605 from vespa-engine/jvenstad/testrunner-loggingJon Marius Venstad2018-08-1612-30/+217
|\ \ | | | | | | Jvenstad/testrunner logging
| * | Avoid : in logger nameJon Marius Venstad2018-08-161-1/+1
| | |
| * | Use a map from uppercase names instead, dohJon Marius Venstad2018-08-161-17/+19
| | |
| * | Revert "Look for upper case log levels by modifying the search term"Jon Marius Venstad2018-08-162-10/+18
| | | | | | | | | | | | This reverts commit a62a3b47817ebb52f8ea4413d37804d4da459171.
| * | Look for upper case log levels by modifying the search termJon Marius Venstad2018-08-162-18/+10
| | |
| * | Remove list of work itemsJon Marius Venstad2018-08-161-30/+0
| | |