summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Use httpclient version from parent pomBjørn Christian Seime2018-11-072-3/+1
* Merge pull request #7589 from vespa-engine/revert-7585-bjorncs/accepted-ciphersTor Brede Vekterli2018-11-074-67/+18
|\
| * Revert "Bjorncs/accepted ciphers"Harald Musum2018-11-074-67/+18
|/
* Merge pull request #7585 from vespa-engine/bjorncs/accepted-ciphersBjørn Christian Seime2018-11-074-18/+67
|\
| * Fix structure of transport-security-options.json test fileBjørn Christian Seime2018-11-061-3/+3
| * Include 'acceptedCiphers' in toString/hashCode/equalsBjørn Christian Seime2018-11-061-2/+4
| * Allow configuration of accepted ciphersBjørn Christian Seime2018-11-061-6/+16
| * Add 'accepted-ciphers' to transport security optionsBjørn Christian Seime2018-11-063-10/+47
* | Merge pull request #7587 from vespa-engine/balder/avoid-aritmetic-execptionHenning Baldersheim2018-11-071-1/+1
|\ \ | |/ |/|
| * Ensure that we do not get division by zero by always requiring non-zero divisor.Henning Baldersheim2018-11-071-1/+1
|/
* Merge pull request #7575 from vespa-engine/balder/use-larger-leafs-for-postin...Henning Baldersheim2018-11-0644-816/+331
|\
| * Instantiate the ConstIterator tooHenning Baldersheim2018-11-062-1/+2
| * Use 64 entries for docid entries and 32 entries for weighted entries for leaf...Henning Baldersheim2018-11-051-2/+2
| * Clean up so all types related to attribute posting lists are defined in one p...Henning Baldersheim2018-11-0516-135/+86
| * Nested namespace and related cleanup.Henning Baldersheim2018-11-0525-596/+210
| * Avoid double bookeeping.Henning Baldersheim2018-11-053-17/+22
| * Unify on an existing typedef.Henning Baldersheim2018-11-053-61/+14
| * typedef -> usingHenning Baldersheim2018-11-051-26/+17
* | Merge pull request #7582 from vespa-engine/ollivir/avoid-query-cloneJon Bratseth2018-11-061-5/+7
|\ \
| * | Avoid Query.clone which changes the sessionId (and the cache key)Olli Virtanen2018-11-061-5/+7
* | | Merge pull request #7581 from vespa-engine/balder/if-you-promised-an-answer-y...Henning Baldersheim2018-11-064-11/+44
|\ \ \
| * | | Test that you do get answer, even a bad one.Henning Baldersheim2018-11-061-0/+19
| * | | If you promise to deliver an answer, you must provide it.Henning Baldersheim2018-11-061-6/+8
| * | | Intellij based cleanup.Henning Baldersheim2018-11-061-3/+2
| * | | No * importHenning Baldersheim2018-11-061-2/+15
* | | | Log number of applications with 0 qps (#7580)olaaun2018-11-061-0/+6
* | | | Merge pull request #7572 from vespa-engine/hmusum/remove-unused-argumentHenning Baldersheim2018-11-061-5/+0
|\ \ \ \ | |/ / / |/| | |
| * | | Remove unused fieldHarald Musum2018-11-051-5/+0
* | | | Merge pull request #7576 from vespa-engine/toregge/allow-priority-name-in-ves...Geir Storli2018-11-062-10/+28
|\ \ \ \
| * | | | Adjust command line parsing for vespa-get to handle priority names.Tor Egge2018-11-052-10/+28
* | | | | Merge pull request #7578 from vespa-engine/bratseth/improve-some-error-messagesgjoranv2018-11-066-41/+62
|\ \ \ \ \
| * | | | | Improve error messagesJon Bratseth2018-11-066-41/+62
* | | | | | Merge pull request #7577 from vespa-engine/gjoranv/bootstrap-optionsBjørn Christian Seime2018-11-061-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Do not run maven in batch mode, don't skip javadoc, not quiet.gjoranv2018-11-061-1/+1
* | | | | | Merge pull request #7571 from vespa-engine/hmusum/use-simpler-map-for-modelsMorten Tokle2018-11-064-77/+110
|\ \ \ \ \ \
| * | | | | | Use simpler map for modelsHarald Musum2018-11-054-77/+110
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #7574 from vespa-engine/bjorncs/debug-loggingBjørn Christian Seime2018-11-051-0/+6
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Verify handshake is complete in write() + flush()Bjørn Christian Seime2018-11-051-0/+2
| * | | | | Add more debug logging to TlsCryptoSocketBjørn Christian Seime2018-11-051-0/+4
* | | | | | Merge pull request #7564 from vespa-engine/hakonhall/send-probe-when-suspendi...Håkon Hallingstad2018-11-0516-121/+157
|\ \ \ \ \ \
| * | | | | | Fix probe messageHåkon Hallingstad2018-11-051-2/+2
| * | | | | | Send probe when suspending many nodesHåkon Hallingstad2018-11-0516-121/+157
* | | | | | | Merge pull request #7566 from vespa-engine/gjoranv/add-maven-env-varsgjoranv2018-11-051-1/+17
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Check for existence of correct variable.gjoranv2018-11-051-2/+2
| * | | | | | Use '-n' to check for non-empty valueArnstein Ressem2018-11-051-1/+1
| * | | | | | Add optional env vars for maven command and extra opts.gjoranv2018-11-051-1/+17
| | |_|_|/ / | |/| | | |
* | | | | | Merge pull request #7567 from vespa-engine/toregge/test-that-internal-feed-ap...Geir Storli2018-11-052-1/+8
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Test that internal feed api reports supported protocol versions.Tor Egge2018-11-052-1/+8
|/ / / / /
* | | | | Merge pull request #7558 from vespa-engine/balder/set-adaptive-timeout-reasonHenning Baldersheim2018-11-053-8/+22
|\ \ \ \ \
| * | | | | Also estimate active docs when enabling adaptive timeout.Henning Baldersheim2018-11-021-2/+3