summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #2764 from yahoo/gjoranv/use-builder-ctor-for-default-nodegjoranv2017-06-142-5/+17
|\ | | | | Use builder to instantiate default node.
| * Add comments about code that most likely can be removed.gjoranv2017-06-142-2/+2
| |
| * Use builder to instantiate default node.gjoranv2017-06-141-3/+15
| |
* | Merge pull request #2771 from yahoo/bratseth/remove-unnecessary-filesTor Egge2017-06-147-810/+0
|\ \ | | | | | | Remove unnecessary files
| * | Remove unnecessary filesJon Bratseth2017-06-147-810/+0
| | |
* | | Merge pull request #2770 from yahoo/bratseth/remove-carriage-returnTor Egge2017-06-14233-4699/+4699
|\ \ \ | | | | | | | | Remove carriage return
| * | | Remove carriage returnJon Bratseth2017-06-14233-4699/+4699
| |/ /
* | | Merge pull request #2747 from ↵Henning Baldersheim2017-06-144-2/+16
|\ \ \ | | | | | | | | | | | | | | | | yahoo/balder/add-some-more-debug-information-in-case-of-error-and-avoid-potential-nullptr-exception Avoid potential NullPtrException and add some more information in cas…
| * | | Avoid potential NullPtrException and add some more information in case ↵Henning Baldersheim2017-06-134-2/+16
| | | | | | | | | | | | | | | | something odd happens.
* | | | Merge pull request #2772 from ↵Kristian Aune2017-06-142-26/+2
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | yahoo/aressem/use-yum-localinstall-to-avoid-listing-dependencies-in-dockerfile Aressem/use yum localinstall to avoid listing dependencies in dockerfile
| * | | Merged master.Arnstein Ressem2017-06-14220-2955/+2455
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #2769 from yahoo/bjorncs/docker-ciBjørn Christian Seime2017-06-142-1/+3
|\ \ \ \ | | | | | | | | | | Bjorncs/docker ci
| * | | | Print executed commands to stdoutBjørn Christian Seime2017-06-142-0/+2
| | | | |
| * | | | Increase heap size for MavenBjørn Christian Seime2017-06-141-1/+1
| | | | |
* | | | | Merge pull request #2767 from ↵Geir Storli2017-06-148-7/+11
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | yahoo/revert-2750-revert-2727-toregge/rename-filedistribution-programs Revert "Revert "Rename filedistribution programs to have vespa- prefix.""
| * | | | | Revert "Revert "Rename filedistribution programs to have vespa- prefix.""Tor Egge2017-06-148-7/+11
| | | | | |
* | | | | | Merge pull request #2760 from yahoo/balder/make-hit-estimation-cheaperHåvard Pettersen2017-06-1412-258/+206
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Balder/make hit estimation cheaper
| * | | | | If more than 1k unique values we will just approximate.Henning Baldersheim2017-06-142-7/+5
| | | | | |
| * | | | | Code cleanup while considering options for hit estimation.Henning Baldersheim2017-06-1411-251/+201
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Less includes - std::make_unique - alignment - GC unused code.
* | | | | | Merge pull request #2765 from ↵Jon Bratseth2017-06-146-7/+9
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | yahoo/revert-2763-revert-2761-bratseth/correct-encoding Revert "Revert "Encode as UTF-8""
| * | | | | | Encode boundary characters as octetsJon Bratseth2017-06-141-1/+3
| | | | | | |
| * | | | | | Revert "Revert "Encode as UTF-8""Jon Bratseth2017-06-146-7/+7
| | | | | | |
* | | | | | | Merge pull request #2766 from yahoo/kkraune/compile-sample-appsJon Bratseth2017-06-143-4/+2
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | build sample apps
| * | | | | | build sample appsKristian Aune2017-06-143-4/+2
| | | | | | |
* | | | | | | Merge pull request #2762 from yahoo/bjorncs/remove-testHarald Musum2017-06-141-8/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Remove unstable test
| * | | | | | | Remove unstable testBjørn Christian Seime2017-06-141-8/+0
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | There is no guarantee that the Norwegian locale is available on the compilation target.
* | | | | | | Merge pull request #2763 from yahoo/revert-2761-bratseth/correct-encodingArnstein Ressem2017-06-146-7/+7
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | Revert "Encode as UTF-8"
| * | | | | | Revert "Encode as UTF-8"Tor Egge2017-06-146-7/+7
|/ / / / / /
* | | | | | Merge pull request #2737 from yahoo/freva/node-retirer-one-per-clusterValerij Fredriksen2017-06-145-60/+89
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Freva/node retirer one per cluster
| * | | | | Allow simultaneous retirement of 1 node per clustervalerijf2017-06-133-57/+58
| | | | | |
| * | | | | Extend MockDeployer to allow multiple clusters per applicationvalerijf2017-06-132-3/+31
| | | | | |
* | | | | | Merge pull request #2761 from yahoo/bratseth/correct-encodingTor Egge2017-06-146-7/+7
|\ \ \ \ \ \ | | | | | | | | | | | | | | Encode as UTF-8
| * | | | | | Encode as UTF-8Jon Bratseth2017-06-146-7/+7
| | |_|_|_|/ | |/| | | |
* | | | | | Merge pull request #2759 from ↵Harald Musum2017-06-141-1/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | yahoo/toregge/send-signal-to-vespa-filedistributor-too Pass a regexp to pkill that matches both new and old name for
| * | | | | | Pass a regexp to pkill that matches both new and old name forTor Egge2017-06-141-1/+6
| | |_|/ / / | |/| | | | | | | | | | | | | | | | the vespa-filedistributor process.
* | | | | | Merge pull request #2733 from yahoo/hmusum/16-distribution-bits-only-for-prodJon Bratseth2017-06-143-69/+84
|\ \ \ \ \ \ | | | | | | | | | | | | | | Enable 16 distribution bits only for prod regions
| * | | | | | Use zoneHarald Musum2017-06-141-4/+11
| | | | | | |
| * | | | | | Add testHarald Musum2017-06-142-60/+65
| | | | | | |
| * | | | | | Merge branch 'master' into hmusum/16-distribution-bits-only-for-prodHarald Musum2017-06-1468-2176/+450
| |\ \ \ \ \ \
| * | | | | | | Enable 16 distribution bits only for prod regionsHarald Musum2017-06-131-9/+12
| | | | | | | |
* | | | | | | | Merge pull request #2756 from yahoo/kkraune/perl-depsArnstein Ressem2017-06-142-0/+8
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | add required perl dependencies
| * | | | | | | | add required perl dependenciesKristian Aune2017-06-142-0/+8
| | | | | | | | |
* | | | | | | | | Merge pull request #2758 from yahoo/bjorncs/log-docker-ciArnstein Ressem2017-06-143-2/+4
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | Store build output to log file
| * | | | | | | | Checkout with detached headBjørn Christian Seime2017-06-141-1/+1
| | | | | | | | |
| * | | | | | | | Store build output to log fileBjørn Christian Seime2017-06-142-1/+3
| | | | | | | | |
* | | | | | | | | Merge pull request #2755 from yahoo/hmusum/minor-cleanupgjoranv2017-06-148-69/+53
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | Minor cleanup
| * | | | | | | | Minor cleanupHarald Musum2017-06-148-69/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reindentation, added a toString(), removed unused methods, style fixes
* | | | | | | | | Merge pull request #2757 from ↵Henning Baldersheim2017-06-141-15/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | yahoo/revert-2753-hmusum/handle-errors-when-reinitializing-filedistributor Revert "Handle errors when reinitializing file distributor"
| * | | | | | | | | Revert "Handle errors when reinitializing file distributor"Harald Musum2017-06-141-15/+2
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #2746 from yahoo/bjorncs/upgrade-maven-install-plugingjoranv2017-06-147-7/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | Upgrade maven-install-plugin to 2.5.2