summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | |
| * | Update expected test resultJon Marius Venstad2018-08-162-11/+12
| | |
| * | Add serialisation of LogRecord objects, with Vespa log levelsJon Marius Venstad2018-08-164-2/+153
| | |
| * | Make LogLevel implementation obey its doc, which seems reasonableJon Marius Venstad2018-08-165-3/+31
| | |
| * | Store information about last test log record received in RunJon Marius Venstad2018-08-156-14/+49
| | |
* | | Merge pull request #6607 from ↵Henning Baldersheim2018-08-163-23/+65
|\ \ \ | | | | | | | | | | | | | | | | vespa-engine/havardpe/adjust-rank-scaling-when-diversifying adjust rank score re-scaling when diversifying
| * | | adjust rank score re-scaling when diversifyingHåvard Pettersen2018-08-163-23/+65
|/ / / | | | | | | | | | | | | implicitly boost the pre re-rank score of selected results based on the score of the best result dropped by the diversity filter.
* | | Merge pull request #6603 from vespa-engine/mpolden/avoid-classloader-path-lookupValerij Fredriksen2018-08-161-1/+1
|\ \ \ | | | | | | | | Avoid unreliable path lookup of test data
| * | | Avoid unreliable path lookup of test dataMartin Polden2018-08-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | IntelliJ occasionally fails to lookup resources via class loader for me, haven't been able to figure out the exact cause, but when it happens tests that use this method fail with NPE. Anyway, relative path should always work and this pattern is used elsewhere.
* | | | Merge pull request #6604 from ↵Henning Baldersheim2018-08-161-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | vespa-engine/hmusum/tighten-allowed-syntax-for-https-uri Tighten allowed syntax for https uri
| * | | | Tighten allowed syntax for https uriHarald Musum2018-08-161-1/+1
| | | | |
* | | | | Merge pull request #6381 from ↵Olli Virtanen2018-08-164-3/+231
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | vespa-engine/ovirtanen/zookeeper-metrics-in-configserver Report zookeeper monitoring statistics in configserver; proposed metrics keys approved
| * | | | zkOutstandingConnections corrected to zkOutstandingRequestsOlli Virtanen2018-08-083-4/+4
| | | | |
| * | | | Cleaned up ZKMetricsUpdater instantiationOlli Virtanen2018-07-122-7/+4
| | | | |
| * | | | Report zookeeper monitoring statistics in configserverOlli Virtanen2018-07-114-2/+233
| | | | |
* | | | | Merge pull request #6588 from vespa-engine/mpolden/new-node-repo-fieldsMartin Polden2018-08-165-35/+98
|\ \ \ \ \ | | | | | | | | | | | | Support new fields in node-repository API
| * | | | | Reject empty versions in /nodes/v2/upgradeMartin Polden2018-08-153-0/+27
| | | | | |
| * | | | | Support new fields in node-repository APIMartin Polden2018-08-152-35/+71
| | | | | |
* | | | | | Merge pull request #6601 from ↵Henning Baldersheim2018-08-162-9/+32
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | vespa-engine/hmusum/add-support-for-tensor-constanft-from-https-uri Add support for https tensor constant uris
| * | | | | | Add support for https tensor constant urisHarald Musum2018-08-162-9/+32
| | | | | | |
* | | | | | | Merge pull request #6602 from vespa-engine/bjorncs/identity-type-always-presentBjørn Christian Seime2018-08-163-39/+7
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | Remove workaround for missing identity type
| * | | | | | Remove workaround for missing identity typeBjørn Christian Seime2018-08-163-39/+7
| |/ / / / /
* | | | | | Merge pull request #6599 from ↵Henning Baldersheim2018-08-161-0/+9
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | vespa-engine/toregge/add-example-in-comment-for-remove-field-path-update-class Add example in comment for remove field path update class.
| * | | | | Add example in comment for remove field path update class.Tor Egge2018-08-161-0/+9
|/ / / / /