summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Revert "Bootstrap local Java builds"Arnstein Ressem2017-05-043-37/+18
* Merge pull request #2390 from yahoo/hakon/bootstrap-local-java-buildsJon Bratseth2017-05-043-18/+37
|\
| * Ignore vespa-hadoop/dependency-reduced-pom.xmlHåkon Hallingstad2017-05-042-401/+1
| * Bootstrap local Java buildsHåkon Hallingstad2017-05-043-18/+437
* | Merge pull request #2389 from yahoo/aressem/dont-use-relative-path-for-genera...Arnstein Ressem2017-05-044-4/+4
|\ \
| * | Must give path for configs to build out of source and to build in CLion.Arnstein Ressem2017-05-044-4/+4
| |/
* | Merge pull request #2387 from yahoo/arnej/reindent-fastlibArne H Juul2017-05-0458-7657/+7559
|\ \ | |/ |/|
| * remove some useless @version and @file commentsArne H Juul2017-05-0417-46/+1
| * fix author fieldsArne H Juul2017-05-0416-36/+36
| * reindentArne H Juul2017-05-0457-7580/+7527
* | Merge pull request #2386 from yahoo/geirst/re-introduce-wipeoldremovedfields-...Henning Baldersheim2017-05-041-0/+8
|\ \
| * | Re-introduce wipeoldremovedfieldsinterval+age to avoid breaking staging tests.Geir Storli2017-05-041-0/+8
|/ /
* | Merge pull request #2384 from yahoo/hakon/correctly-extract-cluster-controlle...Harald Musum2017-05-043-5/+15
|\ \
| * | Make TestUtil generate correct config ID for cluster controller, take 2Håkon Hallingstad2017-05-041-1/+1
| * | Make TestUtil generate correct config ID for cluster controllerHåkon Hallingstad2017-05-041-1/+1
| * | Correctly extract cluster controller index from standalone cluster controllerHåkon Hallingstad2017-05-042-4/+14
* | | Merge pull request #2372 from yahoo/geirst/add-more-proton-tuning-based-on-no...Geir Storli2017-05-048-77/+223
|\ \ \
| * | | Use default builders directly to avoid replacing previous changes done by oth...Geir Storli2017-05-031-13/+6
| * | | Use default builders directly to avoid replacing previous changes done by oth...Geir Storli2017-05-031-43/+33
| * | | Ensure that explicit proton tuning have precedence over default node flavor t...Geir Storli2017-05-036-29/+89
| * | | Tune flush strategy tls size based on available disk.Geir Storli2017-05-032-12/+39
| * | | Tune flush strategy memory limits based on available memory.Geir Storli2017-05-032-11/+34
| * | | Tune document store maxfilesize based on available memory.Geir Storli2017-05-032-2/+55
* | | | Merge pull request #2339 from yahoo/geirst/make-struct-builders-public-in-con...Geir Storli2017-05-041-2/+2
|\ \ \ \ | |_|/ / |/| | |
| * | | Make struct builders public.Geir Storli2017-05-021-2/+2
* | | | Merge pull request #2381 from yahoo/balder/no-system-includesArnstein Ressem2017-05-043-6/+6
|\ \ \ \ | |_|_|/ |/| | |
| * | | Revert unintended changes.Henning Baldersheim2017-05-033-2/+1
| * | | Deinline destructors++Henning Baldersheim2017-05-031-1/+1
| * | | Deinline and add override and signed/unsignedHenning Baldersheim2017-05-031-0/+1
| * | | Add override and inline based on warningsHenning Baldersheim2017-05-031-1/+1
| * | | Do not include vespa as system headers.Henning Baldersheim2017-05-031-4/+4
| * | | Revert the whole revertHenning Baldersheim2017-05-032-1/+1
* | | | Merge pull request #2383 from yahoo/hmusum/handle-all-clustercontroller-confi...Harald Musum2017-05-044-11/+17
|\ \ \ \ | |/ / / |/| | |
| * | | Remove redundant testHarald Musum2017-05-041-6/+0
| * | | Fix getting cluster controller index for standalone clustersHarald Musum2017-05-044-11/+23
|/ / /
* | | Merge pull request #2380 from yahoo/balder/normal-include-vsm-rebased-1Henning Baldersheim2017-05-0322-205/+219
|\ \ \
| * | | Clear array before prepare to avoid crash on reuse.Henning Baldersheim2017-05-033-81/+83
| * | | Fix warnings hidden earlier due to including application headers as system in...Henning Baldersheim2017-05-0322-124/+136
|/ / /
* | | Merge pull request #2379 from yahoo/revert-2376-revert-2370-balder/normal-inc...Henning Baldersheim2017-05-0326-197/+153
|\ \ \
| * | | Revert "Revert "Fix warnings hidden earlier due to including application head...Henning Baldersheim2017-05-0326-197/+153
|/ / /
* | | Merge pull request #2367 from yahoo/balder/normal-include-searchcoreHenning Baldersheim2017-05-0371-306/+275
|\ \ \
| * | | Add missing fileHenning Baldersheim2017-05-021-0/+29
| * | | Fix warnings hidden earlier due to including application headers as system in...Henning Baldersheim2017-05-0270-306/+246
* | | | Merge pull request #2371 from yahoo/balder/normal-include-searchlib-vespaHenning Baldersheim2017-05-03132-1114/+828
|\ \ \ \
| * | | | Fix warnings hidden earlier due to including application headers as system in...Henning Baldersheim2017-05-03132-1114/+828
| | |_|/ | |/| |
* | | | Merge pull request #2364 from yahoo/balder/normal-include-messagebusTor Brede Vekterli2017-05-0322-24/+56
|\ \ \ \
| * | | | Fix warnings hidden earlier due to including application headers as system in...Henning Baldersheim2017-05-0222-24/+56
| | |/ / | |/| |
* | | | Merge pull request #2363 from yahoo/balder/normal-include-documentapiTor Brede Vekterli2017-05-0320-20/+49
|\ \ \ \
| * | | | Fix warnings hidden earlier due to including application headers as system in...Henning Baldersheim2017-05-0220-20/+49
| |/ / /
* | | | Merge pull request #2362 from yahoo/balder/normal-include-storageframeworkTor Brede Vekterli2017-05-036-40/+44
|\ \ \ \