summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Automatic commit of package [vespa] release [6.286.54-1].vespa-6.286.54-1by-screwdriver2018-09-174-1/+2
* Merge pull request #6748 from vespa-engine/hmusum/remove-ideal-headroom-for-d...Harald Musum2018-09-1510-274/+11
|\
| * Remove use of ideal headroom when allocation, has not been used for a long ti...Harald Musum2018-08-3110-274/+11
* | Merge pull request #6965 from vespa-engine/revert-6964-revert-6960-balder/ens...Henning Baldersheim2018-09-1412-37/+69
|\ \
| * | Ensure that we do not get duplicates or have conflicting field definitions wh...Henning Baldersheim2018-09-143-10/+53
| * | Make the example legalHenning Baldersheim2018-09-143-5/+5
| * | Revert "Revert "Use a normal SearchBuilder to get all sanity checks and prepr...Henning Baldersheim2018-09-147-22/+11
* | | Merge pull request #6946 from vespa-engine/hmusum/remove-deprecated-error-codeHenning Baldersheim2018-09-141-6/+0
|\ \ \
| * \ \ Merge branch 'master' into hmusum/remove-deprecated-error-codeHarald Musum2018-09-1427-197/+279
| |\ \ \
| * | | | Remove unused and deprecated error codeHarald Musum2018-09-131-6/+0
* | | | | Merge pull request #6959 from vespa-engine/jvenstad/miscHarald Musum2018-09-142-4/+8
|\ \ \ \ \
| * | | | | Compare against target versions for the other production job, not this oneJon Marius Venstad2018-09-142-3/+7
| * | | | | Revert "Revert PR 6944"Jon Marius Venstad2018-09-141-2/+2
* | | | | | Merge pull request #6962 from vespa-engine/hmusum/use-requested-flavor-in-cdHarald Musum2018-09-141-0/+2
|\ \ \ \ \ \
| * | | | | | Use requested flavor in all zones in CDHarald Musum2018-09-141-0/+2
| |/ / / / /
* | | | | | Merge pull request #6947 from vespa-engine/hmusum/remove-deprecated-constructorHenning Baldersheim2018-09-141-10/+1
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into hmusum/remove-deprecated-constructorHarald Musum2018-09-1427-197/+279
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| * | | | | | Remove deprecated and unused constructorHarald Musum2018-09-131-10/+1
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #6961 from vespa-engine/toregge/remove-spooler-leftovers-f...Henning Baldersheim2018-09-1410-166/+0
|\ \ \ \ \ \
| * | | | | | Remove remains of spooler code from searchcore.Tor Egge2018-09-1410-166/+0
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #6958 from vespa-engine/havardpe/optimistic-write-in-fnetHenning Baldersheim2018-09-142-15/+36
|\ \ \ \ \ \
| * | | | | | enable optimistic writeHåvard Pettersen2018-09-141-1/+5
| * | | | | | handle add/close commands in separate functionsHåvard Pettersen2018-09-142-14/+31
* | | | | | | Merge pull request #6966 from vespa-engine/revert-6902-balder/hashmap-backed-...Henning Baldersheim2018-09-1420-226/+153
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Revert "Do not expose fieldupdates as a list. Hide implementation details ins...Henning Baldersheim2018-09-1420-226/+153
|/ / / / / /
* | | | | | Merge pull request #6964 from vespa-engine/revert-6960-balder/ensure-the-extr...Henning Baldersheim2018-09-147-11/+22
|\ \ \ \ \ \
| * | | | | | Revert "Use a normal SearchBuilder to get all sanity checks and preprocessing...Henning Baldersheim2018-09-147-11/+22
|/ / / / / /
* | | | | | Merge pull request #6960 from vespa-engine/balder/ensure-the-extra-fields-are...Jon Bratseth2018-09-147-22/+11
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Use a normal SearchBuilder to get all sanity checks and preprocessing also wh...Henning Baldersheim2018-09-147-22/+11
|/ / / / /
* | | | | Merge pull request #6957 from vespa-engine/havardpe/disable-fnet-tls-testsHenning Baldersheim2018-09-142-7/+7
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | disable fnet tests using tlsHåvard Pettersen2018-09-142-7/+7
|/ / / /
* | / / Add base handlers to container on logserver host (#6953)Harald Musum2018-09-141-1/+7
| |/ / |/| |
* | | Merge pull request #6952 from vespa-engine/hmusum/revert-6944Arnstein Ressem2018-09-131-2/+2
|\ \ \
| * | | Revert PR 6944Harald Musum2018-09-131-2/+2
|/ / /
* | | Merge pull request #6951 from vespa-engine/gv/verify-bundle-versionBjørn Christian Seime2018-09-131-3/+7
|\ \ \
| * | | Enable and fix test to verify bundle version.gjoranv2018-09-131-3/+7
|/ / /
* | | Merge pull request #6902 from vespa-engine/balder/hashmap-backed-documentupdateHenning Baldersheim2018-09-1320-153/+226
|\ \ \
| * | | Also update hashmap and detect errors due to misuse.Henning Baldersheim2018-09-131-1/+10
| * | | Add Vespa 7 TODOHenning Baldersheim2018-09-132-2/+13
| * | | Add deprecation comments and some renaming.Henning Baldersheim2018-09-137-21/+21
| * | | Add deprecation comments and some renaming.Henning Baldersheim2018-09-1316-71/+98
| * | | Keep both list and hashmapHenning Baldersheim2018-09-123-49/+32
| * | | Avoid using deprecated APIHenning Baldersheim2018-09-1110-43/+54
| * | | Avoid using deprecated code.Henning Baldersheim2018-09-114-8/+8
| * | | Do not expose fieldupdates as a list. Hide implementation details instead.Henning Baldersheim2018-09-114-49/+81
* | | | Merge pull request #6945 from vespa-engine/havardpe/smarter-buffersTor Brede Vekterli2018-09-133-36/+40
|\ \ \ \
| * | | | do not spend time filling buffer space with 0x55Håvard Pettersen2018-09-131-3/+0
| * | | | let xor crypto engine use smart buffersHåvard Pettersen2018-09-131-29/+36
| * | | | use smart buffer for crypto codec adapterHåvard Pettersen2018-09-131-4/+4
* | | | | Merge pull request #6949 from vespa-engine/bjorncs/fix-npe-jettyMorten Tokle2018-09-131-0/+1
|\ \ \ \ \