summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Revert "Revert "Revert "Do not expose fieldupdates as a list. Hide implementa...Henning Baldersheim2018-09-1820-255/+161
* Merge pull request #6986 from vespa-engine/revert-6976-balder/avoid-npeHenning Baldersheim2018-09-182-7/+3
|\
| * Revert "Avoid NPE on non-exiting field"Henning Baldersheim2018-09-182-7/+3
|/
* Merge pull request #6985 from vespa-engine/balder/improve-document-gen-valida...Henning Baldersheim2018-09-1811-17/+54
|\
| * Separate the processing.Processors into a minimal set and the rest. Only use ...Henning Baldersheim2018-09-1711-17/+54
|/
* Merge pull request #6983 from vespa-engine/bjorncs/vagrantGeir Storli2018-09-171-2/+5
|\
| * Add section on starting/stopping the VMBjørn Christian Seime2018-09-171-2/+5
* | Merge pull request #6982 from vespa-engine/toregge/install-runtime-depsGeir Storli2018-09-171-1/+3
|\ \
| * | Install vespa runtime dependencies.Tor Egge2018-09-171-1/+3
| |/
* | Merge pull request #6980 from vespa-engine/geirst/extend-clion-doc-with-toolc...Tor Brede Vekterli2018-09-171-3/+5
|\ \ | |/ |/|
| * Extend note on configuring toolchains.Geir Storli2018-09-171-3/+5
* | Merge pull request #6979 from vespa-engine/toregge/stop-using-proton-search-i...Geir Storli2018-09-174-7/+12
|\ \
| * | Stop using search.io setting from proton.def.Tor Egge2018-09-173-3/+12
| * | Remove dead code.Tor Egge2018-09-171-4/+0
* | | Merge pull request #6975 from vespa-engine/freva/operate-on-byte-arrayValerij Fredriksen2018-09-177-40/+63
|\ \ \
| * | | Operate on byte arrayValerij Fredriksen2018-09-177-40/+63
* | | | Set content type for logs response (#6978)Harald Musum2018-09-171-2/+15
| |_|/ |/| |
* | | Merge pull request #6976 from vespa-engine/balder/avoid-npeHenning Baldersheim2018-09-172-3/+7
|\ \ \ | |_|/ |/| |
| * | Avoid NPE on non-exiting fieldHenning Baldersheim2018-09-172-3/+7
* | | Merge pull request #6968 from vespa-engine/geirst/add-option-to-setup-unprivi...Geir Storli2018-09-172-12/+51
|\ \ \ | |/ / |/| |
| * | Reduce duplication in cmake command args.Geir Storli2018-09-171-14/+9
| * | Add option to setup unprivileged compilation of Vespa.Geir Storli2018-09-142-10/+54
* | | Merge pull request #6973 from vespa-engine/havardpe/process-pending-data-befo...Tor Brede Vekterli2018-09-174-9/+13
|\ \ \
| * | | re-enable fnet tls testsHåvard Pettersen2018-09-172-7/+7
| * | | drain as much as possible before reading more socket dataHåvard Pettersen2018-09-172-2/+6
|/ / /
* | | Merge pull request #6969 from vespa-engine/revert-6966-revert-6902-balder/has...Henning Baldersheim2018-09-1720-161/+255
|\ \ \
| * | | Less strict on possible missuse of deprecated API.Henning Baldersheim2018-09-172-22/+43
| * | | Revert "Revert "Do not expose fieldupdates as a list. Hide implementation det...Henning Baldersheim2018-09-1420-153/+226
* | | | Merge pull request #6971 from vespa-engine/hmusum/dont-use-deprecated-header-...Henning Baldersheim2018-09-171-4/+1
|\ \ \ \
| * | | | Stop using deprecated header statement for sd fieldsHarald Musum2018-09-151-4/+1
| | |_|/ | |/| |
* | | | Merge pull request #6963 from vespa-engine/ollivir/node-group-affinity-in-loa...Olli Virtanen2018-09-172-13/+59
|\ \ \ \
| * | | | Change affinity property name; javadoc cleanupOlli Virtanen2018-09-171-2/+2
| * | | | Reuse node group for allocations by same queryOlli Virtanen2018-09-142-13/+59
* | | | | Call prepare() on logserver container cluster (#6970)Harald Musum2018-09-176-7/+97
* | | | | Merge pull request #6943 from vespa-engine/bjorncs/ssl-provider-public-apiBjørn Christian Seime2018-09-179-14/+19
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Make SslContextFactoryProvider public apiBjørn Christian Seime2018-09-139-14/+19
* | | | | 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
| |/ / / / / / /