summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Found likely cause of problem - should already be fixed but update commentHåkon Hallingstad2017-05-051-3/+5
* Loop over initial modules using -NHåkon Hallingstad2017-05-051-1/+13
* Revert "Revert "Bootstrap local Java builds""hakonhall2017-05-053-18/+37
* Merge pull request #2396 from yahoo/balder/deiniline-copy-and-assignmentHenning Baldersheim2017-05-051-40/+35
|\
| * Generate the copy constructors and assignment operators in .cpp file using th...Henning Baldersheim2017-05-051-40/+35
|/
* Merge pull request #2391 from yahoo/geirst/make-searchcore-compile-without-op...Henning Baldersheim2017-05-0419-10/+46
|\
| * Make searchcore compile without optimizations (-Og).Geir Storli2017-05-0419-10/+46
* | Merge pull request #2388 from yahoo/balder/ensure-config-is-available-before-...Henning Baldersheim2017-05-046-24/+24
|\ \
| * | incompleteConfig -> isConfigComplete and invert logic and move to Main.Henning Baldersheim2017-05-041-7/+6
| * | Whitespace ++Henning Baldersheim2017-05-043-7/+7
| * | Ensure that we have gotten config at least once before starting up.Henning Baldersheim2017-05-044-15/+16
* | | Merge pull request #2395 from yahoo/revert-2382-bratseth/prefer-lowest-costHenning Baldersheim2017-05-046-9/+71
|\ \ \
| * | | Revert "Prefer lower cost nodes over even distribution"Henning Baldersheim2017-05-046-9/+71
|/ / /
* | | Merge pull request #2382 from yahoo/bratseth/prefer-lowest-costJon Bratseth2017-05-046-71/+9
|\ \ \
| * | | Prefer lower cost nodes over even distributionJon Bratseth2017-05-036-71/+9
* | | | Merge pull request #2393 from yahoo/revert-2390-hakon/bootstrap-local-java-bu...Jon Bratseth2017-05-043-37/+18
|\ \ \ \
| * | | | 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