Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #2771 from yahoo/bratseth/remove-unnecessary-files | Tor Egge | 2017-06-14 | 7 | -810/+0 |
|\ | | | | | Remove unnecessary files | ||||
| * | Remove unnecessary files | Jon Bratseth | 2017-06-14 | 7 | -810/+0 |
| | | |||||
* | | Merge pull request #2770 from yahoo/bratseth/remove-carriage-return | Tor Egge | 2017-06-14 | 233 | -4699/+4699 |
|\ \ | | | | | | | Remove carriage return | ||||
| * | | Remove carriage return | Jon Bratseth | 2017-06-14 | 233 | -4699/+4699 |
| |/ | |||||
* | | Merge pull request #2747 from ↵ | Henning Baldersheim | 2017-06-14 | 4 | -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 Baldersheim | 2017-06-13 | 4 | -2/+16 |
| | | | | | | | | | | | | something odd happens. | ||||
* | | | Merge pull request #2772 from ↵ | Kristian Aune | 2017-06-14 | 2 | -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 Ressem | 2017-06-14 | 220 | -2955/+2455 |
| |\ \ | |/ / |/| | | |||||
* | | | Merge pull request #2769 from yahoo/bjorncs/docker-ci | Bjørn Christian Seime | 2017-06-14 | 2 | -1/+3 |
|\ \ \ | | | | | | | | | Bjorncs/docker ci | ||||
| * | | | Print executed commands to stdout | Bjørn Christian Seime | 2017-06-14 | 2 | -0/+2 |
| | | | | |||||
| * | | | Increase heap size for Maven | Bjørn Christian Seime | 2017-06-14 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge pull request #2767 from ↵ | Geir Storli | 2017-06-14 | 8 | -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 Egge | 2017-06-14 | 8 | -7/+11 |
| | | | | | |||||
* | | | | | Merge pull request #2760 from yahoo/balder/make-hit-estimation-cheaper | Håvard Pettersen | 2017-06-14 | 12 | -258/+206 |
|\ \ \ \ \ | |/ / / / |/| | | | | Balder/make hit estimation cheaper | ||||
| * | | | | If more than 1k unique values we will just approximate. | Henning Baldersheim | 2017-06-14 | 2 | -7/+5 |
| | | | | | |||||
| * | | | | Code cleanup while considering options for hit estimation. | Henning Baldersheim | 2017-06-14 | 11 | -251/+201 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Less includes - std::make_unique - alignment - GC unused code. | ||||
* | | | | | Merge pull request #2765 from ↵ | Jon Bratseth | 2017-06-14 | 6 | -7/+9 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | yahoo/revert-2763-revert-2761-bratseth/correct-encoding Revert "Revert "Encode as UTF-8"" | ||||
| * | | | | | Encode boundary characters as octets | Jon Bratseth | 2017-06-14 | 1 | -1/+3 |
| | | | | | | |||||
| * | | | | | Revert "Revert "Encode as UTF-8"" | Jon Bratseth | 2017-06-14 | 6 | -7/+7 |
| | | | | | | |||||
* | | | | | | Merge pull request #2766 from yahoo/kkraune/compile-sample-apps | Jon Bratseth | 2017-06-14 | 3 | -4/+2 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | build sample apps | ||||
| * | | | | | build sample apps | Kristian Aune | 2017-06-14 | 3 | -4/+2 |
| | | | | | | |||||
* | | | | | | Merge pull request #2762 from yahoo/bjorncs/remove-test | Harald Musum | 2017-06-14 | 1 | -8/+0 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Remove unstable test | ||||
| * | | | | | | Remove unstable test | Bjørn Christian Seime | 2017-06-14 | 1 | -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-encoding | Arnstein Ressem | 2017-06-14 | 6 | -7/+7 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | Revert "Encode as UTF-8" | ||||
| * | | | | | Revert "Encode as UTF-8" | Tor Egge | 2017-06-14 | 6 | -7/+7 |
|/ / / / / | |||||
* | | | | | Merge pull request #2737 from yahoo/freva/node-retirer-one-per-cluster | Valerij Fredriksen | 2017-06-14 | 5 | -60/+89 |
|\ \ \ \ \ | |/ / / / |/| | | | | Freva/node retirer one per cluster | ||||
| * | | | | Allow simultaneous retirement of 1 node per cluster | valerijf | 2017-06-13 | 3 | -57/+58 |
| | | | | | |||||
| * | | | | Extend MockDeployer to allow multiple clusters per application | valerijf | 2017-06-13 | 2 | -3/+31 |
| | | | | | |||||
* | | | | | Merge pull request #2761 from yahoo/bratseth/correct-encoding | Tor Egge | 2017-06-14 | 6 | -7/+7 |
|\ \ \ \ \ | | | | | | | | | | | | | Encode as UTF-8 | ||||
| * | | | | | Encode as UTF-8 | Jon Bratseth | 2017-06-14 | 6 | -7/+7 |
| | | | | | | |||||
* | | | | | | Merge pull request #2759 from ↵ | Harald Musum | 2017-06-14 | 1 | -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 for | Tor Egge | 2017-06-14 | 1 | -1/+6 |
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | the vespa-filedistributor process. | ||||
* | | | | | | Merge pull request #2733 from yahoo/hmusum/16-distribution-bits-only-for-prod | Jon Bratseth | 2017-06-14 | 3 | -69/+84 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Enable 16 distribution bits only for prod regions | ||||
| * | | | | | | Use zone | Harald Musum | 2017-06-14 | 1 | -4/+11 |
| | | | | | | | |||||
| * | | | | | | Add test | Harald Musum | 2017-06-14 | 2 | -60/+65 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'master' into hmusum/16-distribution-bits-only-for-prod | Harald Musum | 2017-06-14 | 68 | -2176/+450 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | Enable 16 distribution bits only for prod regions | Harald Musum | 2017-06-13 | 1 | -9/+12 |
| | | | | | | | | |||||
* | | | | | | | | Merge pull request #2756 from yahoo/kkraune/perl-deps | Arnstein Ressem | 2017-06-14 | 2 | -0/+8 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | add required perl dependencies | ||||
| * | | | | | | | | add required perl dependencies | Kristian Aune | 2017-06-14 | 2 | -0/+8 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge pull request #2758 from yahoo/bjorncs/log-docker-ci | Arnstein Ressem | 2017-06-14 | 3 | -2/+4 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | Store build output to log file | ||||
| * | | | | | | | | Checkout with detached head | Bjørn Christian Seime | 2017-06-14 | 1 | -1/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | Store build output to log file | Bjørn Christian Seime | 2017-06-14 | 2 | -1/+3 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge pull request #2755 from yahoo/hmusum/minor-cleanup | gjoranv | 2017-06-14 | 8 | -69/+53 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | Minor cleanup | ||||
| * | | | | | | | | Minor cleanup | Harald Musum | 2017-06-14 | 8 | -69/+53 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reindentation, added a toString(), removed unused methods, style fixes | ||||
* | | | | | | | | | Merge pull request #2757 from ↵ | Henning Baldersheim | 2017-06-14 | 1 | -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 Musum | 2017-06-14 | 1 | -15/+2 |
| | |/ / / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge pull request #2746 from yahoo/bjorncs/upgrade-maven-install-plugin | gjoranv | 2017-06-14 | 7 | -7/+1 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | Upgrade maven-install-plugin to 2.5.2 | ||||
| * | | | | | | | | Upgrade maven-install-plugin to 2.5.2 | Bjørn Christian Seime | 2017-06-13 | 7 | -7/+1 |
| | | | | | | | | | |||||
* | | | | | | | | | Overcommit number of threads (#2743) | Bjørn Christian Seime | 2017-06-14 | 1 | -3/+4 |
| |_|_|_|/ / / / |/| | | | | | | | |||||
* | | | | | | | | Merge pull request #2751 from yahoo/hmusum/use-only-one-deploystate | Geir Storli | 2017-06-14 | 2 | -5/+3 |
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | Make sure to create DeployState only once (and simplify due to that) |